From 4bbb27e3ccf0b1e38ee4a63ca9ec765e167a72bd Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 12 Feb 2012 15:46:21 +0100 Subject: [PATCH] More 'GCC4.6 variable set but not used' fixes. --- src/apps/deskbar/BarView.cpp | 1 - src/apps/deskbar/ExpandoMenuBar.cpp | 1 - src/apps/deskbar/StatusView.cpp | 1 - src/kits/app/Handler.cpp | 2 ++ src/kits/app/Looper.cpp | 4 ++-- src/system/kernel/fs/vfs.cpp | 2 -- src/system/kernel/thread.cpp | 4 ---- src/system/kernel/vm/vm_page.cpp | 6 +++++- 8 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/apps/deskbar/BarView.cpp b/src/apps/deskbar/BarView.cpp index b5565efcf6..7c39e9f151 100644 --- a/src/apps/deskbar/BarView.cpp +++ b/src/apps/deskbar/BarView.cpp @@ -136,7 +136,6 @@ TBarView::Draw(BRect) BRect bounds(Bounds()); rgb_color hilite = tint_color(ViewColor(), B_DARKEN_1_TINT); - rgb_color light = tint_color(ViewColor(), B_LIGHTEN_2_TINT); SetHighColor(hilite); if (AcrossTop()) diff --git a/src/apps/deskbar/ExpandoMenuBar.cpp b/src/apps/deskbar/ExpandoMenuBar.cpp index 85f268b100..5d3a479415 100644 --- a/src/apps/deskbar/ExpandoMenuBar.cpp +++ b/src/apps/deskbar/ExpandoMenuBar.cpp @@ -679,7 +679,6 @@ TExpandoMenuBar::DrawBackground(BRect) BRect bounds(Bounds()); rgb_color menuColor = ViewColor(); rgb_color hilite = tint_color(menuColor, B_DARKEN_1_TINT); - rgb_color dark = tint_color(menuColor, B_DARKEN_2_TINT); rgb_color vlight = tint_color(menuColor, B_LIGHTEN_2_TINT); int32 last = CountItems() - 1; diff --git a/src/apps/deskbar/StatusView.cpp b/src/apps/deskbar/StatusView.cpp index 4ea754c271..bead5e5a32 100644 --- a/src/apps/deskbar/StatusView.cpp +++ b/src/apps/deskbar/StatusView.cpp @@ -1283,7 +1283,6 @@ TDragRegion::Draw(BRect) rgb_color hilite = tint_color(menuColor, B_DARKEN_1_TINT); rgb_color ldark = tint_color(menuColor, 1.02); rgb_color dark = tint_color(menuColor, B_DARKEN_2_TINT); - rgb_color vdark = tint_color(menuColor, B_DARKEN_3_TINT); rgb_color vvdark = tint_color(menuColor, B_DARKEN_4_TINT); rgb_color light = tint_color(menuColor, B_LIGHTEN_2_TINT); diff --git a/src/kits/app/Handler.cpp b/src/kits/app/Handler.cpp index 5b1c8acb00..e200f97d4c 100644 --- a/src/kits/app/Handler.cpp +++ b/src/kits/app/Handler.cpp @@ -223,6 +223,8 @@ BHandler::MessageReceived(BMessage *message) const char *prop; status_t err = message->GetCurrentSpecifier(&cur, &specifier, &form, &prop); + if (err != B_OK) + break; bool known = false; if (cur < 0 || (strcmp(prop, "Messenger") == 0)) { err = reply.AddMessenger("result", this); diff --git a/src/kits/app/Looper.cpp b/src/kits/app/Looper.cpp index 15f074a497..2d1879dbcb 100644 --- a/src/kits/app/Looper.cpp +++ b/src/kits/app/Looper.cpp @@ -1363,7 +1363,7 @@ BLooper::resolve_specifier(BHandler* target, BMessage* message) // (e.g., the 3rd button on the 4th view) do { err = message->GetCurrentSpecifier(&index, &specifier, &form, &property); - if (err) { + if (err != B_OK) { BMessage reply(B_REPLY); reply.AddInt32("error", err); message->SendReply(&reply); @@ -1381,7 +1381,7 @@ BLooper::resolve_specifier(BHandler* target, BMessage* message) // Get current specifier index (may change in ResolveSpecifier()) err = message->GetCurrentSpecifier(&index); - } while (newTarget && newTarget != target && !err && index >= 0); + } while (newTarget && newTarget != target && err == B_OK && index >= 0); return newTarget; } diff --git a/src/system/kernel/fs/vfs.cpp b/src/system/kernel/fs/vfs.cpp index c44fba3bb5..6737a3046c 100644 --- a/src/system/kernel/fs/vfs.cpp +++ b/src/system/kernel/fs/vfs.cpp @@ -2590,7 +2590,6 @@ dir_vnode_to_path(struct vnode* vnode, char* buffer, size_t bufferSize, char nameBuffer[sizeof(struct dirent) + B_FILE_NAME_LENGTH]; char* name = &((struct dirent*)nameBuffer)->d_name[0]; struct vnode* parentVnode; - ino_t parentID; // lookup the parent vnode if (vnode == ioContext->root) { @@ -2613,7 +2612,6 @@ dir_vnode_to_path(struct vnode* vnode, char* buffer, size_t bufferSize, if (Vnode* coveredVnode = get_covered_vnode(parentVnode)) { put_vnode(parentVnode); parentVnode = coveredVnode; - parentID = parentVnode->id; } } diff --git a/src/system/kernel/thread.cpp b/src/system/kernel/thread.cpp index f657d32a94..6c95268c44 100644 --- a/src/system/kernel/thread.cpp +++ b/src/system/kernel/thread.cpp @@ -1878,7 +1878,6 @@ thread_exit(void) Thread* thread = thread_get_current_thread(); Team* team = thread->team; Team* kernelTeam = team_get_kernel_team(); - thread_id parentID = -1; status_t status; struct thread_debug_info debugInfo; team_id teamID = team->id; @@ -1998,9 +1997,6 @@ thread_exit(void) if (deleteTeam) { Team* parent = team->parent; - // remember who our parent was so we can send a signal - parentID = parent->id; - // Set the team job control state to "dead" and detach the job // control entry from our team struct. team_set_job_control_state(team, JOB_CONTROL_STATE_DEAD, NULL, diff --git a/src/system/kernel/vm/vm_page.cpp b/src/system/kernel/vm/vm_page.cpp index 050d8e605d..e7740ddeb6 100644 --- a/src/system/kernel/vm/vm_page.cpp +++ b/src/system/kernel/vm/vm_page.cpp @@ -2296,7 +2296,9 @@ page_writer(void* /*unused*/) { const uint32 kNumPages = 256; uint32 writtenPages = 0; +#ifdef TRACE_VM_PAGE bigtime_t lastWrittenTime = 0; +#endif bigtime_t pageCollectionTime = 0; bigtime_t pageWritingTime = 0; @@ -2440,13 +2442,15 @@ page_writer(void* /*unused*/) // debug output only... writtenPages += numPages; if (writtenPages >= 1024) { +#ifdef TRACE_VM_PAGE bigtime_t now = system_time(); TRACE(("page writer: wrote 1024 pages (total: %llu ms, " "collect: %llu ms, write: %llu ms)\n", (now - lastWrittenTime) / 1000, pageCollectionTime / 1000, pageWritingTime / 1000)); - writtenPages -= 1024; lastWrittenTime = now; +#endif + writtenPages -= 1024; pageCollectionTime = 0; pageWritingTime = 0; }