From 63d557f06f41c0aef30f8a0fcc5b8d2c47981b33 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Thu, 16 Jul 2009 02:42:03 +0000 Subject: [PATCH] Fixing random GCC4 warnings. Mostly missing consts, some parentheses, some braces... Should all be harmless and not change anything. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31600 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 2 +- headers/build/os/kernel/OS.h | 2 +- src/add-ons/kernel/drivers/audio/hda/hda_multi_audio.cpp | 6 +++--- src/add-ons/kernel/drivers/graphics/ati/driver.cpp | 2 +- src/add-ons/kernel/drivers/graphics/s3/driver.cpp | 7 ++++--- .../power/acpi_embedded_controller/SmallResourceData.cpp | 2 +- .../power/acpi_embedded_controller/SmallResourceData.h | 2 +- .../acpi_embedded_controller/acpi_embedded_controller.cpp | 4 ++-- src/add-ons/kernel/drivers/random/driver.c | 4 ++-- src/add-ons/kernel/file_systems/cdda/cdda.cpp | 2 +- src/add-ons/kernel/file_systems/reiserfs/Block.cpp | 2 +- src/add-ons/kernel/file_systems/reiserfs/Settings.cpp | 2 +- .../kernel/file_systems/reiserfs/kernel_interface.cpp | 4 ++-- .../kernel/partitioning_systems/intel/write_support.cpp | 6 ++++-- src/apps/mail/Content.cpp | 8 ++++---- src/apps/mail/Header.cpp | 2 +- src/apps/mail/Header.h | 3 ++- src/bin/df.cpp | 4 ++-- src/bin/hey.cpp | 4 ++-- src/bin/lsindex.cpp | 2 +- src/bin/mkindex.cpp | 2 +- src/bin/mountvolume.cpp | 2 +- src/bin/multiuser/login.cpp | 2 +- src/build/libbe/interface/Bitmap.cpp | 8 ++++++-- src/kits/tracker/WidgetAttributeText.cpp | 2 +- src/servers/app/Window.cpp | 4 ++-- src/servers/app/WorkspacesView.cpp | 7 ++++--- src/servers/cddb_daemon/cddb_daemon.cpp | 2 +- src/servers/mail/main.cpp | 2 +- src/servers/registrar/RosterSettingsCharStream.cpp | 2 +- 30 files changed, 56 insertions(+), 47 deletions(-) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 828cdecaae..3f4901b2c3 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -64,7 +64,7 @@ SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2 zdiff zforce zgrep zip zipcloak zipgrep zipnote zipsplit zmore znew ; -SYSTEM_APPS = AboutSystem ActivityMonitor CharacterMap CodyCam DeskCalc DiskProbe +SYSTEM_APPS = AboutSystem ActivityMonitor CharacterMap CodyCam Debugger DeskCalc DiskProbe DiskUsage DriveSetup CDPlayer Expander Icon-O-Matic Installer LaunchBox Magnify Mail MediaPlayer MidiPlayer NetworkStatus PackageInstaller People PoorMan PowerStatus ProcessController Screenshot ShowImage SoundRecorder diff --git a/headers/build/os/kernel/OS.h b/headers/build/os/kernel/OS.h index 0d7718087e..6bed1bef5e 100644 --- a/headers/build/os/kernel/OS.h +++ b/headers/build/os/kernel/OS.h @@ -354,7 +354,7 @@ extern void debugger(const char *message); to re-enable the default debugger pass a zero. */ -extern const int disable_debugger(int state); +extern int disable_debugger(int state); // TODO: Remove. Temporary debug helper. extern void debug_printf(const char *format, ...) diff --git a/src/add-ons/kernel/drivers/audio/hda/hda_multi_audio.cpp b/src/add-ons/kernel/drivers/audio/hda/hda_multi_audio.cpp index 8859b94d24..b7c667f26a 100644 --- a/src/add-ons/kernel/drivers/audio/hda/hda_multi_audio.cpp +++ b/src/add-ons/kernel/drivers/audio/hda/hda_multi_audio.cpp @@ -580,14 +580,14 @@ set_mix(hda_audio_group* audioGroup, multi_mix_value_info * mmvi) | AMP_SET_LEFT_CHANNEL | AMP_SET_INPUT_INDEX(control->index) | control->mute - | resp[0] & AMP_GAIN_MASK); + | (resp[0] & AMP_GAIN_MASK)); TRACE("set_mix: sending verb to %ld: %lx %lx %x %lx\n", control->nid, control->mute, resp[0] & AMP_GAIN_MASK, control->input, (control->input ? AMP_SET_INPUT : AMP_SET_OUTPUT) | AMP_SET_LEFT_CHANNEL | AMP_SET_INPUT_INDEX(control->index) | control->mute - | resp[0] & AMP_GAIN_MASK); + | (resp[0] & AMP_GAIN_MASK)); verb[1] = MAKE_VERB(audioGroup->codec->addr, control->nid, VID_SET_AMPLIFIER_GAIN_MUTE, @@ -595,7 +595,7 @@ set_mix(hda_audio_group* audioGroup, multi_mix_value_info * mmvi) | AMP_SET_RIGHT_CHANNEL | AMP_SET_INPUT_INDEX(control->index) | control->mute - | resp[1] & AMP_GAIN_MASK); + | (resp[1] & AMP_GAIN_MASK)); TRACE("set_mix: ctrl2 sending verb to %ld: %lx %lx %x\n", control->nid, control->mute, resp[1] & AMP_GAIN_MASK, control->input); hda_send_verbs(audioGroup->codec, verb, NULL, 2); diff --git a/src/add-ons/kernel/drivers/graphics/ati/driver.cpp b/src/add-ons/kernel/drivers/graphics/ati/driver.cpp index 2a09c4709b..af50e2f30f 100644 --- a/src/add-ons/kernel/drivers/graphics/ati/driver.cpp +++ b/src/add-ons/kernel/drivers/graphics/ati/driver.cpp @@ -54,7 +54,7 @@ int32 api_version = B_CUR_DRIVER_API_VERSION; // revision of driver API we suppo struct ChipInfo { uint16 chipID; // PCI device id of the chip ChipType chipType; // assigned chip type identifier - char* chipName; // user recognizable name for chip (must be < 32 chars) + const char* chipName; // user recognizable name for chip (must be < 32 chars) }; diff --git a/src/add-ons/kernel/drivers/graphics/s3/driver.cpp b/src/add-ons/kernel/drivers/graphics/s3/driver.cpp index b3de5bb708..860512b6ec 100644 --- a/src/add-ons/kernel/drivers/graphics/s3/driver.cpp +++ b/src/add-ons/kernel/drivers/graphics/s3/driver.cpp @@ -39,9 +39,10 @@ int32 api_version = B_CUR_DRIVER_API_VERSION; // revision of driver API we suppo struct ChipInfo { - uint16 chipID; // PCI device id of the chip - uint16 chipType; // assigned chip type identifier - char* chipName; // user recognizable name for chip (must be < 32 chars) + uint16 chipID; // PCI device id of the chip + uint16 chipType; // assigned chip type identifier + const char* chipName; // user recognizable name for chip (must be < 32 + // chars) }; // This table maps a PCI device ID to a chip type identifier and the chip name. diff --git a/src/add-ons/kernel/drivers/power/acpi_embedded_controller/SmallResourceData.cpp b/src/add-ons/kernel/drivers/power/acpi_embedded_controller/SmallResourceData.cpp index dc6f91fa87..8fdd388486 100644 --- a/src/add-ons/kernel/drivers/power/acpi_embedded_controller/SmallResourceData.cpp +++ b/src/add-ons/kernel/drivers/power/acpi_embedded_controller/SmallResourceData.cpp @@ -32,7 +32,7 @@ io_port::Print() SmallResourceData::SmallResourceData(acpi_device_module_info* acpi, - acpi_device acpiCookie, char* method) + acpi_device acpiCookie, const char* method) { acpi_data buffer; buffer.pointer = NULL; diff --git a/src/add-ons/kernel/drivers/power/acpi_embedded_controller/SmallResourceData.h b/src/add-ons/kernel/drivers/power/acpi_embedded_controller/SmallResourceData.h index 028b2c525e..0da2b191ff 100644 --- a/src/add-ons/kernel/drivers/power/acpi_embedded_controller/SmallResourceData.h +++ b/src/add-ons/kernel/drivers/power/acpi_embedded_controller/SmallResourceData.h @@ -38,7 +38,7 @@ class SmallResourceData { public: SmallResourceData(acpi_device_module_info* acpi, - acpi_device acpiCookie, char* method); + acpi_device acpiCookie, const char* method); ~SmallResourceData(); status_t InitCheck(); diff --git a/src/add-ons/kernel/drivers/power/acpi_embedded_controller/acpi_embedded_controller.cpp b/src/add-ons/kernel/drivers/power/acpi_embedded_controller/acpi_embedded_controller.cpp index 256aee9739..9de25e1aea 100644 --- a/src/add-ons/kernel/drivers/power/acpi_embedded_controller/acpi_embedded_controller.cpp +++ b/src/add-ons/kernel/drivers/power/acpi_embedded_controller/acpi_embedded_controller.cpp @@ -74,7 +74,7 @@ bus_space_write_1(int address, uint8 v) status_t acpi_GetInteger(acpi_device_module_info* acpi, acpi_device& acpiCookie, - char* path, int* number) + const char* path, int* number) { status_t status; acpi_data buf; @@ -227,7 +227,7 @@ acpi_get_type(device_node* dev) static float embedded_controller_support(device_node *dev) { - static char *ec_ids[] = { "PNP0C09", NULL }; + static const char *ec_ids[] = { "PNP0C09", NULL }; /* Check that this is a device. */ if (acpi_get_type(dev) != ACPI_TYPE_DEVICE) diff --git a/src/add-ons/kernel/drivers/random/driver.c b/src/add-ons/kernel/drivers/random/driver.c index b4400ae06b..a5853e4506 100644 --- a/src/add-ons/kernel/drivers/random/driver.c +++ b/src/add-ons/kernel/drivers/random/driver.c @@ -304,8 +304,8 @@ new_chrand(const unsigned int inittimes) prandgen->rndptrX = prandgen->ira; prandgen->rndptrA = prandgen->ira; prandgen->rndptrB = prandgen->ira; - prandgen->rndLeft.Q[0] = 0x1A4B385C72D69E0FUL; - prandgen->rndRite.Q[0] = 0x9C805FE7361A42DBUL; + prandgen->rndLeft.Q[0] = 0x1A4B385C72D69E0FULL; + prandgen->rndRite.Q[0] = 0x9C805FE7361A42DBULL; reseed (prandgen, inittimes); prandgen->seedptr = prandgen->ira + chrand (prandgen) % NK; diff --git a/src/add-ons/kernel/file_systems/cdda/cdda.cpp b/src/add-ons/kernel/file_systems/cdda/cdda.cpp index 1efdbe9907..3716cad2de 100644 --- a/src/add-ons/kernel/file_systems/cdda/cdda.cpp +++ b/src/add-ons/kernel/file_systems/cdda/cdda.cpp @@ -114,7 +114,7 @@ find_string(const char *string, const char *find) static void -cut_string(char *string, char *cut) +cut_string(char *string, const char *cut) { if (string == NULL || cut == NULL) return; diff --git a/src/add-ons/kernel/file_systems/reiserfs/Block.cpp b/src/add-ons/kernel/file_systems/reiserfs/Block.cpp index 7510c8f3b1..3d98e07283 100644 --- a/src/add-ons/kernel/file_systems/reiserfs/Block.cpp +++ b/src/add-ons/kernel/file_systems/reiserfs/Block.cpp @@ -102,7 +102,7 @@ Block::GetData() const void Block::SetKind(uint32 kind) { - fFlags = fFlags & ~(uint32)KIND_MASK | kind & KIND_MASK; + fFlags = (fFlags & ~(uint32)KIND_MASK) | (kind & KIND_MASK); } // SetChecked diff --git a/src/add-ons/kernel/file_systems/reiserfs/Settings.cpp b/src/add-ons/kernel/file_systems/reiserfs/Settings.cpp index 98d3544844..ec538c8a2b 100644 --- a/src/add-ons/kernel/file_systems/reiserfs/Settings.cpp +++ b/src/add-ons/kernel/file_systems/reiserfs/Settings.cpp @@ -31,7 +31,7 @@ using std::nothrow; \brief Manages the ReiserFS settings. */ -static char *kFSName = "reiserfs"; +static const char *kFSName = "reiserfs"; // defaults static const char *kDefaultDefaultVolumeName = "ReiserFS untitled"; diff --git a/src/add-ons/kernel/file_systems/reiserfs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/reiserfs/kernel_interface.cpp index 7e693d24b6..12400b2529 100644 --- a/src/add-ons/kernel/file_systems/reiserfs/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/reiserfs/kernel_interface.cpp @@ -211,7 +211,7 @@ FUNCTION(("dir: (%Ld: %lu, %lu), entry: `%s'\n", dir->GetID(), dir->GetDirID(), // hide non-file/dir/symlink entries, if the user desires that, and // those entries explicitly set to hidden if (error == B_OK - && (foundNode.IsEsoteric() && volume->GetHideEsoteric() + && ((foundNode.IsEsoteric() && volume->GetHideEsoteric()) || volume->IsNegativeEntry(foundNode.GetID()))) { error = B_ENTRY_NOT_FOUND; } @@ -602,7 +602,7 @@ FUNCTION(("node: (%Ld: %lu, %lu)\n", node->GetID(), node->GetDirID(), if (volume->GetTree()->FindStatItem(dirID, objectID, &statItem) != B_OK || statItem.GetStatData(&statData) != B_OK - || statData.IsEsoteric() && volume->GetHideEsoteric()) { + || (statData.IsEsoteric() && volume->GetHideEsoteric())) { continue; } if (error == B_OK) { diff --git a/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp b/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp index 83059481e4..52f86c51c7 100644 --- a/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp +++ b/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp @@ -219,7 +219,7 @@ get_sibling_partitions_pm(partition_data *partition, partition_data *nextSibling = NULL; for (int32 i = 0; i < partition->child_count; i++) { partition_data *sibling = get_child_partition(partition->id, i); - if (sibling && sibling != child) + if (sibling && sibling != child) { if (sibling->offset <= childOffset) { if (!previousSibling || previousSibling->offset < sibling->offset) previousSibling = sibling; @@ -228,6 +228,7 @@ get_sibling_partitions_pm(partition_data *partition, if (!nextSibling || nextSibling->offset > sibling->offset) nextSibling = sibling; } + } } *previous = previousSibling; *next = nextSibling; @@ -259,7 +260,7 @@ get_sibling_partitions_ep(partition_data *partition, partition_data *nextSibling = NULL; for (int32 i = 0; i < partition->child_count; i++) { partition_data *sibling = get_child_partition(partition->id, i); - if (sibling && sibling != child) + if (sibling && sibling != child) { if (get_offset_ep(sibling) <= childOffset) { if (!previousSibling || previousSibling->offset < sibling->offset) previousSibling = sibling; @@ -268,6 +269,7 @@ get_sibling_partitions_ep(partition_data *partition, if (!nextSibling || nextSibling->offset > sibling->offset) nextSibling = sibling; } + } } *previous = previousSibling; *next = nextSibling; diff --git a/src/apps/mail/Content.cpp b/src/apps/mail/Content.cpp index 28ac7fac1e..131dfe27c9 100644 --- a/src/apps/mail/Content.cpp +++ b/src/apps/mail/Content.cpp @@ -160,7 +160,7 @@ FilterHTMLTag(int32 &first, char **t, char *end) return false; } - const struct { char *name; int32 code; } entities[] = { + const struct { const char *name; int32 code; } entities[] = { // this list is sorted alphabetically to be binary searchable // the current implementation doesn't do this, though @@ -400,7 +400,7 @@ CopyQuotes(const char *text, size_t length, char *outText, size_t &outLength) { // count qoute level (to be able to wrap quotes correctly) - char *quote = QUOTE; + const char *quote = QUOTE; int32 level = 0; for (size_t i = 0; i < length; i++) { if (text[i] == quote[0]) @@ -539,7 +539,7 @@ FillInQuoteTextRuns(BTextView* view, quote_context* context, const char* line, bool search = true; for (next = pos + 1; next < length; next++) { - if (search && is_quote_char(line[next]) + if ((search && is_quote_char(line[next])) || line[next] == '\n') break; else if (search && line[next] != ' ' && line[next] != '\t') @@ -2290,7 +2290,7 @@ TTextView::Reader::ParseMail(BMailContainer *container, enclosure->type = TYPE_ENCLOSURE; - char *name = "\n\n"; + const char *name = "\n\n"; fView->GetSelection(&enclosure->text_start, &enclosure->text_end); enclosure->text_start++; diff --git a/src/apps/mail/Header.cpp b/src/apps/mail/Header.cpp index c231f7b742..de62b094bb 100644 --- a/src/apps/mail/Header.cpp +++ b/src/apps/mail/Header.cpp @@ -734,7 +734,7 @@ THeaderView::LoadMessage(BEmailMessage *mail) // #pragma mark - TTextControl -TTextControl::TTextControl(BRect rect, char *label, BMessage *msg, +TTextControl::TTextControl(BRect rect, const char *label, BMessage *msg, bool incoming, bool resending, int32 resizingMode) : BComboBox(rect, "happy", label, msg, resizingMode), fRefDropMenu(NULL) diff --git a/src/apps/mail/Header.h b/src/apps/mail/Header.h index 7d3830ae1c..fceea89c1f 100644 --- a/src/apps/mail/Header.h +++ b/src/apps/mail/Header.h @@ -123,7 +123,8 @@ class THeaderView : public BBox { class TTextControl : public BComboBox { public: - TTextControl(BRect, char*, BMessage*, bool, bool, int32 resizingMode = B_FOLLOW_NONE); + TTextControl(BRect, const char*, BMessage*, bool, bool, + int32 resizingMode = B_FOLLOW_NONE); virtual void AttachedToWindow(); virtual void MessageReceived(BMessage*); diff --git a/src/bin/df.cpp b/src/bin/df.cpp index c945377867..8d4818343e 100644 --- a/src/bin/df.cpp +++ b/src/bin/df.cpp @@ -20,7 +20,7 @@ void -PrintFlag(uint32 deviceFlags, uint32 testFlag, char *yes, char *no) +PrintFlag(uint32 deviceFlags, uint32 testFlag, const char *yes, const char *no) { printf(deviceFlags & testFlag ? yes : no); } @@ -71,7 +71,7 @@ ByteString(int64 numBlocks, int64 blockSize) if (blocks < 1024) sprintf(string, "%Ld", numBlocks * blockSize); else { - char *units[] = {"K", "M", "G", NULL}; + const char *units[] = {"K", "M", "G", NULL}; int32 i = -1; do { diff --git a/src/bin/hey.cpp b/src/bin/hey.cpp index ba9f56ca3f..b311ea353b 100644 --- a/src/bin/hey.cpp +++ b/src/bin/hey.cpp @@ -315,9 +315,9 @@ HeyInterpreterThreadHook(void* arg) return 1; BMessage environment(*(BMessage*) arg); - char* prompt = "Hey"; + const char* prompt = "Hey"; if (environment.HasString("prompt")) - environment.FindString("prompt", (const char **)&prompt); + environment.FindString("prompt", &prompt); printf("%s> ", prompt); BMessenger target; diff --git a/src/bin/lsindex.cpp b/src/bin/lsindex.cpp index bb81b5e469..e0c9f686c3 100644 --- a/src/bin/lsindex.cpp +++ b/src/bin/lsindex.cpp @@ -46,7 +46,7 @@ print_index_type(const index_info &info, bool mkindexOutput) return mkindexOutput ? "double" : "Double"; default: - sprintf(buffer, mkindexOutput ? "0x%08lx" : "Unknown type (0x%x)", info.type); + sprintf(buffer, mkindexOutput ? "0x%08lx" : "Unknown type (0x%lx)", info.type); return buffer; } } diff --git a/src/bin/mkindex.cpp b/src/bin/mkindex.cpp index 8a20425265..0d8696bae3 100644 --- a/src/bin/mkindex.cpp +++ b/src/bin/mkindex.cpp @@ -96,7 +96,7 @@ usage(int status) int main(int argc, char **argv) { - char *indexTypeName = "string"; + const char *indexTypeName = "string"; int indexType = B_STRING_TYPE; char *indexName = NULL; bool verbose = false; diff --git a/src/bin/mountvolume.cpp b/src/bin/mountvolume.cpp index 4294b984d1..4c3ff626da 100644 --- a/src/bin/mountvolume.cpp +++ b/src/bin/mountvolume.cpp @@ -99,7 +99,7 @@ size_string(int64 size) if (size < 1024) sprintf(string, "%Ld", size); else { - char* units[] = {"K", "M", "G", NULL}; + const char* units[] = {"K", "M", "G", NULL}; int32 i = -1; do { diff --git a/src/bin/multiuser/login.cpp b/src/bin/multiuser/login.cpp index c02829bfbb..d4dfba5181 100644 --- a/src/bin/multiuser/login.cpp +++ b/src/bin/multiuser/login.cpp @@ -38,7 +38,7 @@ set_tty_echo(bool enabled) return errno; // do we have to change the current setting at all? - if (enabled == (termios.c_lflag & ECHO) != 0) + if (enabled == ((termios.c_lflag & ECHO) != 0)) return B_OK; if (enabled) diff --git a/src/build/libbe/interface/Bitmap.cpp b/src/build/libbe/interface/Bitmap.cpp index 93ae490877..a021540a3f 100644 --- a/src/build/libbe/interface/Bitmap.cpp +++ b/src/build/libbe/interface/Bitmap.cpp @@ -740,6 +740,7 @@ struct RGB24Reader : public BaseReader<_PixelType> { color.red = pixel.red; color.green = pixel.green; color.blue = pixel.blue; + color.alpha = 255; BaseReader<_PixelType>::pixels++; } @@ -770,6 +771,7 @@ struct RGB16Reader : public BaseReader<_PixelType> { color.red |= color.red >> 5; color.green |= color.green >> 6; color.blue |= color.blue >> 5; + color.alpha = 255; BaseReader<_PixelType>::pixels++; } @@ -800,6 +802,7 @@ struct RGB15Reader : public BaseReader<_PixelType> { color.red |= color.red >> 5; color.green |= color.green >> 5; color.blue |= color.blue >> 5; + color.alpha = 255; BaseReader<_PixelType>::pixels++; } @@ -843,6 +846,7 @@ struct Gray8Reader : public BaseReader { inline void Read(rgb_color_value &color) { color.red = color.green = color.blue = *BaseReader::pixels; + color.alpha = 255; BaseReader::pixels++; } @@ -881,6 +885,7 @@ struct Gray1Reader : public BaseReader { color.red = color.green = color.blue = 255; else color.red = color.green = color.blue = 0; + color.alpha = 255; bit--; if (bit == -1) { pixels++; @@ -935,8 +940,7 @@ struct RGB32Writer : public BaseWriter<_PixelType> { pixel.red = color.red; pixel.green = color.green; pixel.blue = color.blue; -// pixel.alpha = 255; -pixel.alpha = color.alpha; + pixel.alpha = color.alpha; BaseWriter<_PixelType>::pixels++; } diff --git a/src/kits/tracker/WidgetAttributeText.cpp b/src/kits/tracker/WidgetAttributeText.cpp index f5e105bc92..7e6d5be0d1 100644 --- a/src/kits/tracker/WidgetAttributeText.cpp +++ b/src/kits/tracker/WidgetAttributeText.cpp @@ -1740,7 +1740,7 @@ GenericAttributeText::CommitEditedTextFlavor(BTextView *textView) BAlert *alert = new BAlert("", "There was an error writing the attribute.", "Cancel", 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT); - alert->SetShortcut(0, B_CANCEL); + alert->SetShortcut(0, B_ESCAPE); alert->Go(); fValueIsDefined = false; diff --git a/src/servers/app/Window.cpp b/src/servers/app/Window.cpp index dbd6b26997..0cb9c82b00 100644 --- a/src/servers/app/Window.cpp +++ b/src/servers/app/Window.cpp @@ -1578,8 +1578,8 @@ Window::HasInSubset(const Window* window) const return false; } - if (fFeel == B_FLOATING_APP_WINDOW_FEEL - && window->Feel() != B_MODAL_APP_WINDOW_FEEL + if ((fFeel == B_FLOATING_APP_WINDOW_FEEL + && window->Feel() != B_MODAL_APP_WINDOW_FEEL) || fFeel == B_MODAL_APP_WINDOW_FEEL) return window->ServerWindow()->App() == ServerWindow()->App(); diff --git a/src/servers/app/WorkspacesView.cpp b/src/servers/app/WorkspacesView.cpp index 3292dd5269..36ceaeab08 100644 --- a/src/servers/app/WorkspacesView.cpp +++ b/src/servers/app/WorkspacesView.cpp @@ -461,7 +461,8 @@ WorkspacesView::MouseDown(BMessage* message, BPoint where) // If this window is movable, we keep it selected // (we prevent our own window from being moved, too) - if (fSelectedWindow != NULL && (fSelectedWindow->Flags() & B_NOT_MOVABLE) != 0 + if ((fSelectedWindow != NULL + && (fSelectedWindow->Flags() & B_NOT_MOVABLE) != 0) || fSelectedWindow == Window()) { fSelectedWindow = NULL; } @@ -528,8 +529,8 @@ WorkspacesView::MouseMoved(BMessage* message, BPoint where) if (index != fSelectedWorkspace) { if (fSelectedWindow->IsNormal() && !fSelectedWindow->InWorkspace(index)) { // move window to this new workspace - uint32 newWorkspaces = fSelectedWindow->Workspaces() - & ~(1UL << fSelectedWorkspace) | (1UL << index); + uint32 newWorkspaces = (fSelectedWindow->Workspaces() + & ~(1UL << fSelectedWorkspace)) | (1UL << index); Window()->Desktop()->SetWindowWorkspaces(fSelectedWindow, newWorkspaces); diff --git a/src/servers/cddb_daemon/cddb_daemon.cpp b/src/servers/cddb_daemon/cddb_daemon.cpp index da6bd992a9..debfbaae2f 100644 --- a/src/servers/cddb_daemon/cddb_daemon.cpp +++ b/src/servers/cddb_daemon/cddb_daemon.cpp @@ -84,7 +84,7 @@ CDDBDaemon::_Lookup(const dev_t device) uint32 cddbId; if (!_CanLookup(device, &cddbId, toc)) { free(toc); - printf("Skipping device with id %d.\n", device); + printf("Skipping device with id %ld.\n", device); return B_BAD_TYPE; } diff --git a/src/servers/mail/main.cpp b/src/servers/mail/main.cpp index 62c859928e..c47d34b7aa 100644 --- a/src/servers/mail/main.cpp +++ b/src/servers/mail/main.cpp @@ -626,7 +626,7 @@ makeIndices() void -addAttribute(BMessage &msg,char *name,char *publicName,int32 type = B_STRING_TYPE,bool viewable = true,bool editable = false,int32 width = 200) +addAttribute(BMessage &msg,const char *name,const char *publicName,int32 type = B_STRING_TYPE,bool viewable = true,bool editable = false,int32 width = 200) { msg.AddString("attr:name",name); msg.AddString("attr:public_name",publicName); diff --git a/src/servers/registrar/RosterSettingsCharStream.cpp b/src/servers/registrar/RosterSettingsCharStream.cpp index b3f8f9949c..199141d3fd 100644 --- a/src/servers/registrar/RosterSettingsCharStream.cpp +++ b/src/servers/registrar/RosterSettingsCharStream.cpp @@ -77,7 +77,7 @@ RosterSettingsCharStream::GetString(char *result) if (error) return error; - typedef enum RosterSettingsScannerState { + enum RosterSettingsScannerState { rsssStart, rsssUnquoted, rsssQuoted,