[haiku-commits] haiku: hrev43777 - in src: kits/tracker apps apps/poorman . add-ons/kernel/file_systems/iso9660
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 23 Feb 2012 20:52:02 +0100 (CET)
hrev43777 adds 4 changesets to branch 'master'
old head: d4ad358195309bc43d96c70502b0948b3fe3f037
new head: 5c6b9eb00d0d623c12f72eb82a471cb4c71f4f33
----------------------------------------------------------------------------
0d33f92: PDF driver: variable set but not used.
eb5f363: Fixes some occurrences of 'variable set but not used', disables Werror
for problematic items.
4bbb27e: More 'GCC4.6 variable set but not used' fixes.
5c6b9eb: Some fixes for GCC 4.6 warning: variable set but not used
[ Jerome Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
53 files changed, 115 insertions(+), 158 deletions(-)
build/jam/BuildSetup | 8 ++--
headers/private/firewire/fwglue.h | 2 +-
src/add-ons/accelerants/neomagic/InitAccelerant.c | 3 +-
src/add-ons/accelerants/neomagic/SetDisplayMode.c | 11 +++--
.../kernel/bus_managers/firewire/fwohci.cpp | 1 +
src/add-ons/kernel/busses/usb/uhci.cpp | 6 +--
.../kernel/drivers/disk/floppy/pc_floppy/floppy.c | 3 +-
src/add-ons/kernel/drivers/disk/virtual/nbd/nbd.c | 32 ++++++++++++---
.../kernel/drivers/ports/usb_serial/ACM.cpp | 2 -
.../kernel/file_systems/bfs/kernel_interface.cpp | 2 -
.../kernel/file_systems/iso9660/iso9660.cpp | 14 +++---
src/add-ons/kernel/file_systems/nfs/nfs_add_on.c | 10 +---
.../kernel/file_systems/udf/Recognition.cpp | 4 --
src/add-ons/kernel/generic/mpu401/mpu401.c | 6 +--
.../media-add-ons/opensound/OpenSoundNode.cpp | 4 +-
src/add-ons/print/drivers/pdf/source/Fonts.cpp | 9 +---
src/add-ons/translators/raw/RAW.cpp | 6 ++-
src/add-ons/translators/rtf/main.cpp | 2 +-
src/apps/deskbar/BarView.cpp | 1 -
src/apps/deskbar/ExpandoMenuBar.cpp | 1 -
src/apps/deskbar/StatusView.cpp | 1 -
src/apps/mail/ComboBox.cpp | 3 -
src/apps/mail/Content.cpp | 3 +-
src/apps/mail/KUndoBuffer.cpp | 7 ++-
src/apps/mediaconverter/MediaConverterApp.cpp | 4 +-
.../media_node_framework/video/VideoProducer.cpp | 2 -
src/apps/poorman/PoorManPreferencesWindow.cpp | 15 ++-----
src/apps/poorman/PoorManServer.cpp | 12 +----
src/apps/processcontroller/Preferences.cpp | 3 +-
src/apps/showimage/Filter.cpp | 3 +-
src/apps/terminal/AppearPrefView.cpp | 2 -
src/apps/terminal/TermParse.cpp | 4 +-
src/bin/dstcheck.cpp | 2 -
src/bin/error.c | 1 -
src/bin/fdinfo.cpp | 2 +-
src/kits/app/Handler.cpp | 2 +
src/kits/app/Looper.cpp | 4 +-
src/kits/media/SoundPlayer.cpp | 4 --
src/kits/tracker/FSUtils.cpp | 3 -
src/kits/tracker/FindPanel.cpp | 18 +++++----
src/kits/tracker/MountMenu.cpp | 2 -
src/kits/tracker/OpenWithWindow.cpp | 2 -
src/kits/tracker/RecentItems.cpp | 6 +-
src/kits/tracker/SlowContextPopup.cpp | 12 +++---
src/kits/tracker/TrackerInitialState.cpp | 4 +-
.../shortcuts/clv/CLVColumnLabelView.cpp | 6 ---
.../Painter/drawing_modes/DrawingModeInvert.h | 1 +
.../drawing_modes/DrawingModeInvertSUBPIX.h | 1 +
src/servers/app/font/GlyphLayoutEngine.h | 4 +-
src/servers/notification/AppGroupView.cpp | 1 -
src/system/kernel/fs/vfs.cpp | 2 -
src/system/kernel/thread.cpp | 4 --
src/system/kernel/vm/vm_page.cpp | 6 ++-
############################################################################
Commit: 0d33f92c77d5c05774103e0d9abfb58ae13b30c9
URL: http://cgit.haiku-os.org/haiku/commit/?id=0d33f92
Author: Jerome Duval <jerome.duval@xxxxxxxxx>
Date: Sat Feb 11 18:20:46 2012 UTC
PDF driver: variable set but not used.
----------------------------------------------------------------------------
diff --git a/src/add-ons/print/drivers/pdf/source/Fonts.cpp
b/src/add-ons/print/drivers/pdf/source/Fonts.cpp
index d3e7a60..a7a6ad4 100644
--- a/src/add-ons/print/drivers/pdf/source/Fonts.cpp
+++ b/src/add-ons/print/drivers/pdf/source/Fonts.cpp
@@ -347,7 +347,7 @@ static status_t ttf_get_fontname(const char * path, char *
fontname, size_t fn_s
uint16 nb_tables, nb_records;
uint16 i;
uint32 tag;
- uint32 checksum, table_offset, length;
+ uint32 table_offset;
uint32 strings_offset;
char family_name[256];
char face_name[256];
@@ -378,10 +378,8 @@ static status_t ttf_get_fontname(const char * path, char *
fontname, size_t fn_s
for (i = 0; i < nb_tables; ++i) {
tag = ttf_get_uint32(ttf);
- checksum = ttf_get_uint32(ttf);
table_offset = ttf_get_uint32(ttf);
- length = ttf_get_uint32(ttf);
-
+
if (tag == TRUETTYPE_TABLE_NAME_TAG)
break;
}
@@ -407,12 +405,11 @@ static status_t ttf_get_fontname(const char * path, char
* fontname, size_t fn_s
names_found = 0;
for (i = 0; i < nb_records; ++i) {
- uint16 platform_id, encoding_id, language_id, name_id;
+ uint16 platform_id, encoding_id, name_id;
uint16 string_len, string_offset;
platform_id = ttf_get_uint16(ttf);
encoding_id = ttf_get_uint16(ttf);
- language_id = ttf_get_uint16(ttf);
name_id = ttf_get_uint16(ttf);
string_len = ttf_get_uint16(ttf);
string_offset = ttf_get_uint16(ttf);
############################################################################
Commit: eb5f36397841abfc740031fde56ca5e4dee9fdd3
URL: http://cgit.haiku-os.org/haiku/commit/?id=eb5f363
Author: Jerome Duval <jerome.duval@xxxxxxxxx>
Date: Sun Feb 12 14:13:04 2012 UTC
Fixes some occurrences of 'variable set but not used', disables Werror for
problematic items.
----------------------------------------------------------------------------
diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 3288429..cf43dc5 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -1222,7 +1222,7 @@ if $(HAIKU_NO_WERROR) != 1 {
# EnableWerror src add-ons accelerants nvidia ;
EnableWerror src add-ons accelerants nvidia_gpgpu ;
# EnableWerror src add-ons accelerants radeon ;
- EnableWerror src add-ons accelerants radeon_hd ;
+# EnableWerror src add-ons accelerants radeon_hd ;
EnableWerror src add-ons accelerants s3 ;
EnableWerror src add-ons accelerants skeleton ;
EnableWerror src add-ons accelerants vesa ;
@@ -1239,7 +1239,7 @@ if $(HAIKU_NO_WERROR) != 1 {
EnableWerror src add-ons kernel bus_managers agp_gart ;
EnableWerror src add-ons kernel bus_managers ata ;
EnableWerror src add-ons kernel bus_managers config_manager ;
- EnableWerror src add-ons kernel bus_managers firewire ;
+# EnableWerror src add-ons kernel bus_managers firewire ;
EnableWerror src add-ons kernel bus_managers isa ;
EnableWerror src add-ons kernel bus_managers pci ;
# EnableWerror src add-ons kernel bus_managers ps2 ; # gcc2
@@ -1352,10 +1352,10 @@ if $(HAIKU_NO_WERROR) != 1 {
EnableWerror src add-ons translators rtf ;
EnableWerror src add-ons translators sgi ;
EnableWerror src add-ons translators shared ;
- EnableWerror src add-ons translators stxt ;
+# EnableWerror src add-ons translators stxt ;
EnableWerror src add-ons translators tga ;
EnableWerror src add-ons translators tiff ;
- EnableWerror src add-ons translators wonderbrush ;
+# EnableWerror src add-ons translators wonderbrush ;
EnableWerror src add-ons print ;
EnableWerror src bin package ;
EnableWerror src apps ;
diff --git a/headers/private/firewire/fwglue.h
b/headers/private/firewire/fwglue.h
index c26f4ed..8962240 100644
--- a/headers/private/firewire/fwglue.h
+++ b/headers/private/firewire/fwglue.h
@@ -41,7 +41,7 @@ typedef uint32_t bus_size_t;
#define wakeup(i) release_sem_etc(i->Sem, 0, B_RELEASE_IF_WAITING_ONLY |
B_RELEASE_ALL)
#define splfw() 0
-#define splx(s)
+#define splx(s) (void)s
#define hz 1000000LL
diff --git a/src/add-ons/accelerants/neomagic/InitAccelerant.c
b/src/add-ons/accelerants/neomagic/InitAccelerant.c
index 8f159c9..d3840f0 100644
--- a/src/add-ons/accelerants/neomagic/InitAccelerant.c
+++ b/src/add-ons/accelerants/neomagic/InitAccelerant.c
@@ -260,13 +260,12 @@ a buffer at least ACCELERANT_CLONE_INFO_SIZE() bytes in
length.
void GET_ACCELERANT_CLONE_INFO(void *data)
{
nm_device_name dn;
- status_t result;
/* call the kernel driver to get the device name */
dn.magic = NM_PRIVATE_DATA_MAGIC;
/* store the returned info directly into the passed buffer */
dn.name = (char *)data;
- result = ioctl(fd, NM_DEVICE_NAME, &dn, sizeof(dn));
+ ioctl(fd, NM_DEVICE_NAME, &dn, sizeof(dn));
}
/*
diff --git a/src/add-ons/accelerants/neomagic/SetDisplayMode.c
b/src/add-ons/accelerants/neomagic/SetDisplayMode.c
index 614ae1e..50cdf14 100644
--- a/src/add-ons/accelerants/neomagic/SetDisplayMode.c
+++ b/src/add-ons/accelerants/neomagic/SetDisplayMode.c
@@ -6,6 +6,7 @@
Rudolf Cornelissen 4/2003-1/2006
*/
+
#define MODULE_BIT 0x00200000
#include "acc_std.h"
@@ -14,21 +15,21 @@
Enable/Disable interrupts. Just a wrapper around the
ioctl() to the kernel driver.
*/
-static void interrupt_enable(bool flag)
+static void
+interrupt_enable(bool flag)
{
- status_t result;
nm_set_bool_state sbs;
- if (si->ps.int_assigned)
- {
+ if (si->ps.int_assigned) {
/* set the magic number so the driver knows we're for real */
sbs.magic = NM_PRIVATE_DATA_MAGIC;
sbs.do_it = flag;
/* contact driver and get a pointer to the registers and shared
data */
- result = ioctl(fd, NM_RUN_INTERRUPTS, &sbs, sizeof(sbs));
+ ioctl(fd, NM_RUN_INTERRUPTS, &sbs, sizeof(sbs));
}
}
+
/* First validate the mode, then call lots of bit banging stuff to set the
mode(s)! */
status_t SET_DISPLAY_MODE(display_mode *mode_to_set)
{
diff --git a/src/add-ons/kernel/bus_managers/firewire/fwohci.cpp
b/src/add-ons/kernel/bus_managers/firewire/fwohci.cpp
index aea85f8..e79b1ae 100644
--- a/src/add-ons/kernel/bus_managers/firewire/fwohci.cpp
+++ b/src/add-ons/kernel/bus_managers/firewire/fwohci.cpp
@@ -780,6 +780,7 @@ fwohci_timeout(void *arg)
struct fwohci_softc *sc;
sc = (struct fwohci_softc *)arg;
+ (void)sc;
}
uint32_t
diff --git a/src/add-ons/kernel/busses/usb/uhci.cpp
b/src/add-ons/kernel/busses/usb/uhci.cpp
index 5c805fa..db3de2c 100644
--- a/src/add-ons/kernel/busses/usb/uhci.cpp
+++ b/src/add-ons/kernel/busses/usb/uhci.cpp
@@ -772,19 +772,17 @@ UHCI::CheckDebugTransfer(DebugTransfer *transfer, bool
&_stillPending)
}
if (transferOK) {
- size_t actualLength = 0;
uint8 lastDataToggle = 0;
if (transfer->TransferPipe()->Direction() == Pipe::In) {
// data to read out
iovec *vector = transfer->Vector();
size_t vectorCount = transfer->VectorCount();
- actualLength =
ReadDescriptorChain(transfer->firstDescriptor,
+ ReadDescriptorChain(transfer->firstDescriptor,
vector, vectorCount, &lastDataToggle);
} else {
// read the actual length that was sent
- actualLength =
ReadActualLength(transfer->firstDescriptor,
- &lastDataToggle);
+ ReadActualLength(transfer->firstDescriptor,
&lastDataToggle);
}
transfer->TransferPipe()->SetDataToggle(lastDataToggle == 0);
diff --git a/src/add-ons/kernel/drivers/disk/floppy/pc_floppy/floppy.c
b/src/add-ons/kernel/drivers/disk/floppy/pc_floppy/floppy.c
index 819fe61..e2f4ed7 100644
--- a/src/add-ons/kernel/drivers/disk/floppy/pc_floppy/floppy.c
+++ b/src/add-ons/kernel/drivers/disk/floppy/pc_floppy/floppy.c
@@ -345,7 +345,6 @@ static status_t
flo_open(const char *name, uint32 flags, floppy_cookie **cookie)
{
int i;
- status_t err;
TRACE("open(%s)\n", name);
if (flags & O_NONBLOCK)
return EINVAL;
@@ -361,7 +360,7 @@ flo_open(const char *name, uint32 flags, floppy_cookie
**cookie)
(*cookie)->flp = &(floppies[i]);
/* if we don't know yet if there's something in, check that */
if ((*cookie)->flp->status <= FLOP_MEDIA_CHANGED)
- err = query_media((*cookie)->flp, false);
+ query_media((*cookie)->flp, false);
return B_OK;
}
diff --git a/src/add-ons/kernel/drivers/disk/virtual/nbd/nbd.c
b/src/add-ons/kernel/drivers/disk/virtual/nbd/nbd.c
index d2e5e7b..f3cc5e8 100644
--- a/src/add-ons/kernel/drivers/disk/virtual/nbd/nbd.c
+++ b/src/add-ons/kernel/drivers/disk/virtual/nbd/nbd.c
@@ -9,6 +9,7 @@
* Maps a Network Block Device as virtual partitions.
*/
+
#include <ByteOrder.h>
#include <KernelExport.h>
#include <Drivers.h>
@@ -226,6 +227,7 @@ err0:
return err;
}
+
status_t nbd_queue_request(struct nbd_device *dev, struct nbd_request_entry
*req)
{
PRINT((DP ">%s(handle:%Ld)\n", __FUNCTION__, req->handle));
@@ -234,6 +236,7 @@ status_t nbd_queue_request(struct nbd_device *dev, struct
nbd_request_entry *req
return B_OK;
}
+
status_t nbd_dequeue_request(struct nbd_device *dev, uint64 handle, struct
nbd_request_entry **req)
{
struct nbd_request_entry *r, *prev;
@@ -256,6 +259,7 @@ status_t nbd_dequeue_request(struct nbd_device *dev, uint64
handle, struct nbd_r
return B_OK;
}
+
status_t nbd_free_request(struct nbd_device *dev, struct nbd_request_entry
*req)
{
PRINT((DP ">%s(handle:%Ld)\n", __FUNCTION__, req->handle));
@@ -265,7 +269,6 @@ status_t nbd_free_request(struct nbd_device *dev, struct
nbd_request_entry *req)
}
-
#if 0
#pragma mark ==== nbd handler ====
#endif
@@ -355,6 +358,7 @@ err:
return err;
}
+
status_t nbd_connect(struct nbd_device *dev)
{
struct nbd_init_packet initpkt;
@@ -415,17 +419,19 @@ err0:
return err;
}
+
status_t nbd_teardown(struct nbd_device *dev)
{
- status_t err, ret;
+ status_t ret;
PRINT((DP ">%s()\n", __FUNCTION__));
kshutdown(dev->sock, SHUT_RDWR);
kclosesocket(dev->sock);
dev->sock = -1;
- err = wait_for_thread(dev->postoffice, &ret);
+ wait_for_thread(dev->postoffice, &ret);
return B_OK;
}
+
status_t nbd_post_request(struct nbd_device *dev, struct nbd_request_entry
*req)
{
status_t err;
@@ -455,8 +461,8 @@ static struct nbd_device nbd_devices[MAX_NBDS];
status_t nbd_open(const char *name, uint32 flags, cookie_t **cookie) {
status_t err;
- int32 refcnt;
#ifdef MOUNT_KLUDGE
+ int32 refcnt;
int kfd;
#endif
struct nbd_device *dev = NULL;
@@ -479,8 +485,8 @@ status_t nbd_open(const char *name, uint32 flags, cookie_t
**cookie) {
err = nbd_connect(dev);
if (err)
goto err2;
- refcnt = dev->refcnt++;
#ifdef MOUNT_KLUDGE
+ refcnt = dev->refcnt++;
kfd = dev->kludge;
dev->kludge = -1;
#endif
@@ -507,6 +513,7 @@ err0:
return err;
}
+
status_t nbd_close(cookie_t *cookie) {
struct nbd_device *dev = cookie->dev;
status_t err;
@@ -535,6 +542,7 @@ status_t nbd_close(cookie_t *cookie) {
return B_OK;
}
+
status_t nbd_free(cookie_t *cookie) {
struct nbd_device *dev = cookie->dev;
status_t err;
@@ -554,6 +562,7 @@ status_t nbd_free(cookie_t *cookie) {
return err;
}
+
status_t nbd_control(cookie_t *cookie, uint32 op, void *data, size_t len) {
PRINT((DP ">%s(%d, %lu, , %ld)\n", __FUNCTION__, WHICH(cookie->dev),
op, len));
switch (op) {
@@ -609,6 +618,7 @@ status_t nbd_control(cookie_t *cookie, uint32 op, void
*data, size_t len) {
return B_NOT_ALLOWED;
}
+
status_t nbd_read(cookie_t *cookie, off_t position, void *data, size_t
*numbytes) {
struct nbd_device *dev = cookie->dev;
struct nbd_request_entry *req;
@@ -677,6 +687,7 @@ err0:
return err;
}
+
status_t nbd_write(cookie_t *cookie, off_t position, const void *data, size_t
*numbytes) {
struct nbd_device *dev = cookie->dev;
struct nbd_request_entry *req;
@@ -748,6 +759,7 @@ err0:
return err;
}
+
device_hooks nbd_hooks={
(device_open_hook)nbd_open,
(device_close_hook)nbd_close,
@@ -771,6 +783,7 @@ static char *nbd_name[MAX_NBDS+1] = {
NULL
};
+
status_t
init_hardware (void)
{
@@ -778,6 +791,7 @@ init_hardware (void)
return B_OK;
}
+
status_t
init_driver (void)
{
@@ -849,22 +863,23 @@ init_driver (void)
return B_OK;
}
+
void
uninit_driver (void)
{
- status_t err;
int i;
PRINT((DP ">%s()\n", __FUNCTION__));
for (i = 0; i < MAX_NBDS; i++) {
free(nbd_name[i]);
mutex_destroy(&nbd_devices[i].ben);
}
- err = ksocket_cleanup();
+ ksocket_cleanup();
/* HACK */
if (gDelayUnload)
snooze(BONE_TEARDOWN_DELAY);
}
+
const char**
publish_devices()
{
@@ -872,6 +887,7 @@ publish_devices()
return (const char **)nbd_name;
}
+
device_hooks*
find_device(const char* name)
{
@@ -879,6 +895,7 @@ find_device(const char* name)
return &nbd_hooks;
}
+
struct nbd_device*
nbd_find_device(const char* name)
{
@@ -892,3 +909,4 @@ nbd_find_device(const char* name)
}
return NULL;
}
+
diff --git a/src/add-ons/kernel/drivers/ports/usb_serial/ACM.cpp
b/src/add-ons/kernel/drivers/ports/usb_serial/ACM.cpp
index 0114e52..75a01d6 100644
--- a/src/add-ons/kernel/drivers/ports/usb_serial/ACM.cpp
+++ b/src/add-ons/kernel/drivers/ports/usb_serial/ACM.cpp
@@ -26,7 +26,6 @@ ACMDevice::AddDevice(const usb_configuration_info *config)
uint8 slaveIndex = 0;
usb_cdc_cm_functional_descriptor* cmDesc = NULL;
usb_cdc_union_functional_descriptor* unionDesc = NULL;
- usb_cdc_acm_functional_descriptor* acmDesc = NULL;
// Search ACM Communication Interface
for (size_t i = 0; i < config->interface_count && status < B_OK; i++) {
@@ -46,7 +45,6 @@ ACMDevice::AddDevice(const usb_configuration_info *config)
break;
case USB_CDC_ACM_FUNCTIONAL_DESCRIPTOR:
- acmDesc =
(usb_cdc_acm_functional_descriptor*)generic;
break;
case USB_CDC_UNION_FUNCTIONAL_DESCRIPTOR:
diff --git a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
index fd7bb0c..fff1563 100644
--- a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
@@ -1189,13 +1189,11 @@ bfs_rename(fs_volume* _volume, fs_vnode* _oldDir, const
char* oldName,
newDirectory->ID(), newName);
// update the name only when they differ
- bool nameUpdated = false;
if (strcmp(oldName, newName)) {
status = inode->SetName(transaction, newName);
if (status == B_OK) {
Index index(volume);
index.UpdateName(transaction, oldName, newName, inode);
- nameUpdated = true;
}
}
diff --git a/src/add-ons/kernel/file_systems/iso9660/iso9660.cpp
b/src/add-ons/kernel/file_systems/iso9660/iso9660.cpp
index a9caafd..d64b45b 100644
--- a/src/add-ons/kernel/file_systems/iso9660/iso9660.cpp
+++ b/src/add-ons/kernel/file_systems/iso9660/iso9660.cpp
@@ -292,7 +292,6 @@ parse_rock_ridge(iso9660_volume* volume, iso9660_inode*
node, char* buffer,
char* slName = NULL;
uint16 altNameSize = 0;
uint16 slNameSize = 0;
- uint8 slFlags = 0;
uint8 length = 0;
bool done = false;
@@ -358,7 +357,6 @@ parse_rock_ridge(iso9660_volume* volume, iso9660_inode*
node, char* buffer,
case 'SL':
{
uint8 bytePos = 3;
- uint8 lastCompFlag = 0;
uint8 addPos = 0;
bool slDone = false;
bool useSeparator = true;
@@ -368,9 +366,10 @@ parse_rock_ridge(iso9660_volume* volume, iso9660_inode*
node, char* buffer,
TRACE(("Current length is %u\n", slNameSize));
//kernel_debugger("");
node->attr.slVer = *(uint8*)(buffer +
bytePos++);
- slFlags = *(uint8*)(buffer + bytePos++);
-
+#if TRACE_ISO9660
+ uint8 slFlags = *(uint8*)(buffer + bytePos++);
TRACE(("sl flags are %u\n", slFlags));
+#endif
while (!slDone && bytePos < length) {
uint8 compFlag = *(uint8*)(buffer +
bytePos++);
uint8 compLen = *(uint8*)(buffer +
bytePos++);
@@ -453,7 +452,6 @@ parse_rock_ridge(iso9660_volume* volume, iso9660_inode*
node, char* buffer,
}
if (slName != NULL)
slName[slNameSize] = '\0';
- lastCompFlag = compFlag;
bytePos += compLen;
TRACE(("Current sl name is \'%s\'\n",
slName));
}
@@ -573,7 +571,7 @@ ISOMount(const char *path, uint32 flags, iso9660_volume
**_newVolume,
off_t offset = 0x8000;
ssize_t retval;
partition_info partitionInfo;
- int deviceBlockSize, multiplier;
+ int deviceBlockSize;
iso9660_volume *volume;
(void)flags;
@@ -642,8 +640,10 @@ ISOMount(const char *path, uint32 flags, iso9660_volume
**_newVolume,
volume->id = ISO_ROOTNODE_ID;
TRACE(("ISO9660: volume->blockSize = %d\n",
volume->logicalBlkSize[FS_DATA_FORMAT]));
- multiplier = deviceBlockSize /
volume->logicalBlkSize[FS_DATA_FORMAT];
+#if TRACE_ISO9660
+ int multiplier = deviceBlockSize /
volume->logicalBlkSize[FS_DATA_FORMAT];
TRACE(("ISOMount: block size multiplier is
%d\n", multiplier));
+#endif
// if the session is on a real device, size != 0
if (partitionInfo.size != 0) {
diff --git a/src/add-ons/kernel/file_systems/nfs/nfs_add_on.c
b/src/add-ons/kernel/file_systems/nfs/nfs_add_on.c
index eade948..1341e37 100644
--- a/src/add-ons/kernel/file_systems/nfs/nfs_add_on.c
+++ b/src/add-ons/kernel/file_systems/nfs/nfs_add_on.c
@@ -856,7 +856,6 @@ fs_release_vnode(fs_volume *_volume, fs_vnode *node, bool r)
static status_t
fs_walk(fs_volume *_volume, fs_vnode *_base, const char *file, ino_t *vnid)
{
- bool isLink;
fs_node *dummy;
status_t result;
fs_nspace *ns;
@@ -866,10 +865,9 @@ fs_walk(fs_volume *_volume, fs_vnode *_base, const char
*file, ino_t *vnid)
ns = _volume->private_volume;
base = _base->private_node;
- if (!strcmp(".", file)) {
+ if (!strcmp(".", file))
*vnid = base->vnid;
- isLink = false;
- } else {
+ else {
fs_node *newNode = (fs_node *)malloc(sizeof(fs_node));
struct stat st;
@@ -884,8 +882,6 @@ fs_walk(fs_volume *_volume, fs_vnode *_base, const char
*file, ino_t *vnid)
*vnid = newNode->vnid;
insert_node(ns, newNode);
-
- isLink = S_ISLNK(st.st_mode);
}
if ((result = get_vnode (_volume, *vnid, (void **)&dummy)) < B_OK)
@@ -2371,12 +2367,12 @@ fs_symlink(fs_volume *_volume, fs_vnode *_dir, const
char *name,
}
status = XDRInPacketGetInt32(&reply);
-
/* if (status!=NFS_OK)
return map_nfs_to_system_error(status);
ignore status here, weird thing, nfsservers that is
*/
+ (void)status;
result = nfs_lookup(ns, &dir->fhandle, name, &fhandle, &st);
diff --git a/src/add-ons/kernel/file_systems/udf/Recognition.cpp
b/src/add-ons/kernel/file_systems/udf/Recognition.cpp
index ea1228f..ca1ea9e 100644
--- a/src/add-ons/kernel/file_systems/udf/Recognition.cpp
+++ b/src/add-ons/kernel/file_systems/udf/Recognition.cpp
@@ -109,11 +109,9 @@ walk_volume_recognition_sequence(int device, off_t offset,
uint32 blockSize,
return B_ERROR;
}
- bool foundISO = false;
bool foundExtended = false;
bool foundECMA167 = false;
bool foundECMA168 = false;
- bool foundBoot = false;
for (uint32 block = 16; true; block++) {
off_t address = (offset + block) << blockShift;
TRACE(("walk_volume_recognition_sequence: block = %ld, "
@@ -124,7 +122,6 @@ walk_volume_recognition_sequence(int device, off_t offset,
uint32 blockSize,
= (volume_structure_descriptor_header
*)(chunk.Data());
if (descriptor->id_matches(kVSDID_ISO)) {
TRACE(("found ISO9660 descriptor\n"));
- foundISO = true;
} else if (descriptor->id_matches(kVSDID_BEA)) {
TRACE(("found BEA descriptor\n"));
foundExtended = true;
@@ -139,7 +136,6 @@ walk_volume_recognition_sequence(int device, off_t offset,
uint32 blockSize,
foundECMA167 = true;
} else if (descriptor->id_matches(kVSDID_BOOT)) {
TRACE(("found boot descriptor\n"));
- foundBoot = true;
} else if (descriptor->id_matches(kVSDID_ECMA168)) {
TRACE(("found ECMA-168 descriptor\n"));
foundECMA168 = true;
diff --git a/src/add-ons/kernel/generic/mpu401/mpu401.c
b/src/add-ons/kernel/generic/mpu401/mpu401.c
index f9fda84..7bf72c9 100644
--- a/src/add-ons/kernel/generic/mpu401/mpu401.c
+++ b/src/add-ons/kernel/generic/mpu401/mpu401.c
@@ -279,13 +279,11 @@ midi_read(void *cookie, off_t pos, void *buffer, size_t
*num_bytes)
unsigned char *data;
unsigned int i;
- size_t count;
cpu_status status;
status_t bestat;
mpu401device *mpu_device = (mpu401device *)cookie;
data = (unsigned char*)buffer;
- count = *(num_bytes);
i = 0;
*num_bytes = 0;
@@ -358,7 +356,6 @@ midi_write(void * cookie, off_t pos, const void * data,
size_t * num_bytes)
static bool
interrupt_hook(void * cookie)
{
- status_t bestat;
mpu401device *mpu_device = (mpu401device *)cookie;
/* Only for deep debugging..will slow things down */
@@ -381,8 +378,7 @@ interrupt_hook(void * cookie)
mbuf_current++; /* pointer to next blank byte */
mbuf_bytes++; /* increment count of midi data bytes */
- bestat = release_sem_etc(mpu_device->readsemaphore, 1,
- B_DO_NOT_RESCHEDULE);
+ release_sem_etc(mpu_device->readsemaphore, 1,
B_DO_NOT_RESCHEDULE);
return TRUE; //B_INVOKE_SCHEDULER
}
diff --git a/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp
b/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp
index c83860a..39d747d 100644
--- a/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp
+++ b/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp
@@ -2143,7 +2143,7 @@ return B_OK;
// char oldValues[128];
char newValues[128];
- size_t oldValuesSize;
+// size_t oldValuesSize;
size_t newValuesSize;
for (int i = 0; i < mixer->CountExtInfos(); i++) {
@@ -2177,7 +2177,7 @@ return B_OK;
// if (!parameter)
// continue;
- oldValuesSize = 128;
+// oldValuesSize = 128;
newValuesSize = 128;
bigtime_t last;
// TRACE("OpenSoundNode::%s: comparing mixer control %d\n",
diff --git a/src/add-ons/translators/raw/RAW.cpp
b/src/add-ons/translators/raw/RAW.cpp
index 2f02887..8329016 100644
--- a/src/add-ons/translators/raw/RAW.cpp
+++ b/src/add-ons/translators/raw/RAW.cpp
@@ -951,7 +951,7 @@ DCRaw::_ScaleColors()
if (fProgressMonitor != NULL)
fProgressMonitor("Scale Colors", 5, fProgressData);
- int dblack, c, val, sum[8];
+ int c, val, sum[8];
uint32 row, col, x, y;
double dsum[8], dmin, dmax;
float scale_mul[4];
@@ -1020,7 +1020,9 @@ DCRaw::_ScaleColors()
if (fMeta.pre_multipliers[3] == 0)
fMeta.pre_multipliers[3] = fColors < 4 ?
fMeta.pre_multipliers[1] : 1;
- dblack = fMeta.black;
+#if 0
+ int dblack = fMeta.black;
+#endif
if (fThreshold)
_WaveletDenoise();
diff --git a/src/add-ons/translators/rtf/main.cpp
b/src/add-ons/translators/rtf/main.cpp
index 29a571c..57e8168 100644
--- a/src/add-ons/translators/rtf/main.cpp
+++ b/src/add-ons/translators/rtf/main.cpp
@@ -57,7 +57,7 @@ main(int argc, char** argv)
convert_to_plain_text(header, output);
}
- return 1;
+ return result;
}
BApplication app("application/x-vnd.Haiku-RTFTranslator");
############################################################################
Commit: 4bbb27e3ccf0b1e38ee4a63ca9ec765e167a72bd
URL: http://cgit.haiku-os.org/haiku/commit/?id=4bbb27e
Author: Jerome Duval <jerome.duval@xxxxxxxxx>
Date: Sun Feb 12 14:46:21 2012 UTC
More 'GCC4.6 variable set but not used' fixes.
----------------------------------------------------------------------------
diff --git a/src/apps/deskbar/BarView.cpp b/src/apps/deskbar/BarView.cpp
index b5565ef..7c39e9f 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 85f268b..5d3a479 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 4ea754c..bead5e5 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 5b1c8ac..e200f97 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 15f074a..2d1879d 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 c44fba3..6737a30 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 f657d32..6c95268 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 050d8e6..e7740dd 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;
}
############################################################################
Revision: hrev43777
Commit: 5c6b9eb00d0d623c12f72eb82a471cb4c71f4f33
URL: http://cgit.haiku-os.org/haiku/commit/?id=5c6b9eb
Author: Jerome Duval <jerome.duval@xxxxxxxxx>
Date: Thu Feb 23 19:26:18 2012 UTC
Some fixes for GCC 4.6 warning: variable set but not used
----------------------------------------------------------------------------
diff --git a/src/apps/mail/ComboBox.cpp b/src/apps/mail/ComboBox.cpp
index a9c60f3..68abfcd 100644
--- a/src/apps/mail/ComboBox.cpp
+++ b/src/apps/mail/ComboBox.cpp
@@ -1417,7 +1417,6 @@ BComboBox::Draw(BRect /*updateRect*/)
BRect bounds = Bounds();
font_height fInfo;
rgb_color high = HighColor();
- rgb_color low = LowColor();
rgb_color base = ViewColor();
bool focused;
bool enabled;
@@ -1474,8 +1473,6 @@ BComboBox::Draw(BRect /*updateRect*/)
StrokeRect(fr);
SetHighColor(high);
- rgb_color oldCol = HighColor();
-
bounds.right = bounds.left + fDivider;
if ((Label()) && (fDivider > 0.0)) {
BPoint loc;
diff --git a/src/apps/mail/Content.cpp b/src/apps/mail/Content.cpp
index 28a3687..036e77f 100644
--- a/src/apps/mail/Content.cpp
+++ b/src/apps/mail/Content.cpp
@@ -1550,9 +1550,8 @@ TTextView::MouseDown(BPoint where)
BMenuItem *menuItem;
BPopUpMenu menu("Words", false, false);
- int32 matchCount;
for (int32 i = 0; i < gDictCount; i++)
- matchCount =
gWords[i]->FindBestMatches(&matches,
+ gWords[i]->FindBestMatches(&matches,
srcWord.String());
if (matches.CountItems()) {
diff --git a/src/apps/mail/KUndoBuffer.cpp b/src/apps/mail/KUndoBuffer.cpp
index 5babccb..37729c5 100644
--- a/src/apps/mail/KUndoBuffer.cpp
+++ b/src/apps/mail/KUndoBuffer.cpp
@@ -131,9 +131,10 @@ status_t
KUndoBuffer::AddUndo(const char* text, int32 length, int32 offset,
undo_type history, int32 cursor_pos)
{
- if (fNoTouch) return B_OK;
+ if (fNoTouch)
+ return B_OK;
- status_t status;
+ status_t status = B_OK;
if (fNewItem || (fIndex < CountItems()) || (CountItems()==0)) {
status = NewUndo(text, length, offset, history, cursor_pos);
@@ -167,7 +168,7 @@ KUndoBuffer::AddUndo(const char* text, int32 length, int32
offset,
}
}
- return B_OK;
+ return status;
}
diff --git a/src/apps/mediaconverter/MediaConverterApp.cpp
b/src/apps/mediaconverter/MediaConverterApp.cpp
index 24354a9..1441966 100644
--- a/src/apps/mediaconverter/MediaConverterApp.cpp
+++ b/src/apps/mediaconverter/MediaConverterApp.cpp
@@ -359,8 +359,6 @@ MediaConverterApp::_ConvertFile(BMediaFile* inFile,
BMediaFile* outFile,
int32 width = -1;
int32 height = -1;
- short audioFrameSize = 1;
-
uint8* videoBuffer = NULL;
uint8* audioBuffer = NULL;
@@ -384,7 +382,7 @@ MediaConverterApp::_ConvertFile(BMediaFile* inFile,
BMediaFile* outFile,
audioBuffer = new uint8[raf->buffer_size];
// audioFrameSize = (raf->format &
media_raw_audio_format::B_AUDIO_SIZE_MASK)
- audioFrameSize = (raf->format & 0xf) *
raf->channel_count;
+// audioFrameSize = (raf->format & 0xf) *
raf->channel_count;
outAudTrack = outFile->CreateTrack(&outAudFormat,
audioCodec);
if (outAudTrack != NULL) {
diff --git a/src/apps/mediaplayer/media_node_framework/video/VideoProducer.cpp
b/src/apps/mediaplayer/media_node_framework/video/VideoProducer.cpp
index 063e63d..a8a28be 100644
--- a/src/apps/mediaplayer/media_node_framework/video/VideoProducer.cpp
+++ b/src/apps/mediaplayer/media_node_framework/video/VideoProducer.cpp
@@ -634,7 +634,6 @@ VideoProducer::_FrameGeneratorThread()
bigtime_t waitUntil = 0;
bigtime_t nextWaitUntil = 0;
int32 playingDirection = 0;
- int32 playingMode = 0;
int64 playlistFrame = 0;
switch (err) {
case B_OK: {
@@ -645,7 +644,6 @@ VideoProducer::_FrameGeneratorThread()
// get the times for the current and the next
frame
performanceTime =
fManager->TimeForFrame(fFrame);
nextPerformanceTime =
fManager->TimeForFrame(fFrame + 1);
- playingMode = fManager->PlayModeAtFrame(fFrame);
waitUntil =
TimeSource()->RealTimeFor(fPerformanceTimeBase
+ performanceTime, fBufferLatency);
nextWaitUntil =
TimeSource()->RealTimeFor(fPerformanceTimeBase
diff --git a/src/apps/poorman/PoorManPreferencesWindow.cpp
b/src/apps/poorman/PoorManPreferencesWindow.cpp
index 94667ba..1ceb036 100644
--- a/src/apps/poorman/PoorManPreferencesWindow.cpp
+++ b/src/apps/poorman/PoorManPreferencesWindow.cpp
@@ -218,17 +218,12 @@ PoorManPreferencesWindow::SelectWebDir(BMessage * message)
const char * name;
BPath path;
BEntry entry;
- status_t err = B_OK;
- err = message->FindRef("refs", &ref) != B_OK;
- //if (err = message->FindRef("directory", &ref) != B_OK)
- //return err;
- err = message->FindString("name", &name) != B_OK;
- //if (err = message->FindString("name", &name) != B_OK)
- // ;//return err;
- err = entry.SetTo(&ref) != B_OK;
- //if (err = entry.SetTo(&ref) != B_OK)
- // ;//return err;
+ if (message->FindRef("refs", &ref) != B_OK
+ || message->FindString("name", &name) != B_OK
+ || entry.SetTo(&ref) != B_OK) {
+ return;
+ }
entry.GetPath(&path);
PRINT(("DIR: %s\n", path.Path()));
diff --git a/src/apps/poorman/PoorManServer.cpp
b/src/apps/poorman/PoorManServer.cpp
index 3c433c2..dacc2ac 100644
--- a/src/apps/poorman/PoorManServer.cpp
+++ b/src/apps/poorman/PoorManServer.cpp
@@ -350,25 +350,19 @@ cleanup: ;
status_t PoorManServer::_HandleGet(httpd_conn* hc)
{
PRINT(("HandleGet() called\n"));
-
- off_t length;
+
ssize_t bytesRead;
uint8* buf;
BString log;
-
+
BFile file(hc->expnfilename, B_READ_ONLY);
if (file.InitCheck() != B_OK)
return B_ERROR;
-
+
buf = new uint8[POOR_MAN_BUF_SIZE];
if (buf == NULL)
return B_ERROR;
- if (hc->got_range == 1)
- length = hc->last_byte_index + 1 - hc->first_byte_index;
- else
- length = hc->sb.st_size;
-
static_cast<PoorManApplication*>(be_app)->GetPoorManWindow()->SetHits(
static_cast<PoorManApplication*>(be_app)->
GetPoorManWindow()->GetHits() + 1);
diff --git a/src/apps/processcontroller/Preferences.cpp
b/src/apps/processcontroller/Preferences.cpp
index 15b49d9..e7fd7b9 100644
--- a/src/apps/processcontroller/Preferences.cpp
+++ b/src/apps/processcontroller/Preferences.cpp
@@ -89,14 +89,13 @@ Preferences::~Preferences()
{
if (fSavePreferences) {
BFile file;
- status_t set = B_ERROR;
if (fSettingsFile)
file.SetTo(fSettingsFile, B_READ_WRITE | B_CREATE_FILE
| B_ERASE_FILE);
else {
BPath prefpath;
if (find_directory(B_USER_SETTINGS_DIRECTORY,
&prefpath, true) == B_OK) {
BDirectory prefdir(prefpath.Path());
- set = prefdir.CreateFile(fName, &file, false);
+ prefdir.CreateFile(fName, &file, false);
}
}
diff --git a/src/apps/showimage/Filter.cpp b/src/apps/showimage/Filter.cpp
index 3d9f65b..17678b5 100644
--- a/src/apps/showimage/Filter.cpp
+++ b/src/apps/showimage/Filter.cpp
@@ -731,7 +731,7 @@ Scaler::Dither(int32 fromRow, int32 toRow)
{
BBitmap* src;
BBitmap* dest;
- intType destW, destH;
+ intType destW;
intType x, y;
uchar* srcBits;
@@ -759,7 +759,6 @@ Scaler::Dither(int32 fromRow, int32 toRow)
ASSERT(src->Bounds().IntegerHeight() == dest->Bounds().IntegerHeight());
destW = dest->Bounds().IntegerWidth();
- destH = dest->Bounds().IntegerHeight();
srcBits = (uchar*)src->Bits();
srcBPR = src->BytesPerRow();
diff --git a/src/apps/terminal/AppearPrefView.cpp
b/src/apps/terminal/AppearPrefView.cpp
index 64eb813..75b8784 100644
--- a/src/apps/terminal/AppearPrefView.cpp
+++ b/src/apps/terminal/AppearPrefView.cpp
@@ -380,12 +380,10 @@ AppearancePrefView::_SetCurrentColorSchema(BMenuField*
field)
schemas++;
}
- bool found = false;
for (int32 i = 0; i < fColorSchemaField->Menu()->CountItems(); i++) {
BMenuItem* item = fColorSchemaField->Menu()->ItemAt(i);
if (!strcmp(item->Label(), currentSchemaName)) {
item->SetMarked(true);
- found = true;
break;
}
}
diff --git a/src/apps/terminal/TermParse.cpp b/src/apps/terminal/TermParse.cpp
index 856e12d..e5600c3 100644
--- a/src/apps/terminal/TermParse.cpp
+++ b/src/apps/terminal/TermParse.cpp
@@ -361,7 +361,7 @@ TermParse::EscParse()
{
int top;
int bottom;
- int cs96 = 0;
+// int cs96 = 0;
uchar curess = 0;
char cbuf[4] = { 0 };
@@ -586,7 +586,7 @@ TermParse::EscParse()
case CASE_GSETS:
/* ESC $ ? */
parsestate = gCS96GroundTable;
- cs96 = 1;
+ // cs96 = 1;
break;
case CASE_SCS_STATE:
diff --git a/src/bin/dstcheck.cpp b/src/bin/dstcheck.cpp
index 32eb98a..90715ae 100644
--- a/src/bin/dstcheck.cpp
+++ b/src/bin/dstcheck.cpp
@@ -112,11 +112,9 @@ main(int argc, char **argv)
}
strcat(path, "/time_dststatus");
- bool newFile = false;
bool dst = false;
int fd = open(path, O_RDWR | O_EXCL | O_CREAT, S_IRUSR | S_IWUSR);
if (fd < 0) {
- newFile = false;
fd = open(path, O_RDWR);
if (fd < 0) {
perror("couldn't open dst status settings file");
diff --git a/src/bin/error.c b/src/bin/error.c
index 5db4b32..ff2b98c 100644
--- a/src/bin/error.c
+++ b/src/bin/error.c
@@ -310,7 +310,6 @@ print_error(char *number)
if (end[0]) {
// not a number, check names
- int i;
struct error_pair *p = kErrorNames;
while (p->name && strcmp(p->name, number))
p++;
diff --git a/src/bin/fdinfo.cpp b/src/bin/fdinfo.cpp
index 9703666..2ac12e0 100644
--- a/src/bin/fdinfo.cpp
+++ b/src/bin/fdinfo.cpp
@@ -174,7 +174,7 @@ main(int argc, char **argv)
switch (mode) {
case kList:
if ((id != -1 && id != info.team)
- || pattern != NULL &&
!strstr(info.args, pattern))
+ || (pattern != NULL &&
!strstr(info.args, pattern)))
continue;
print_fds(info);
break;
diff --git a/src/kits/media/SoundPlayer.cpp b/src/kits/media/SoundPlayer.cpp
index c37d400..42db720 100644
--- a/src/kits/media/SoundPlayer.cpp
+++ b/src/kits/media/SoundPlayer.cpp
@@ -121,24 +121,20 @@ BSoundPlayer::~BSoundPlayer()
// nodes that we're using. We *are* supposed to do that even
for global
// nodes like the Mixer.
err = roster->Disconnect(fMediaOutput, fMediaInput);
-#if DEBUG > 0
if (err != B_OK) {
TRACE("BSoundPlayer::~BSoundPlayer: Error disconnecting
nodes: "
"%ld (%s)\n", err, strerror(err));
}
-#endif
}
if ((fFlags & F_MUST_RELEASE_MIXER) != 0) {
// Release the mixer as it was acquired
// through BMediaRoster::GetAudioMixer()
err = roster->ReleaseNode(fMediaInput.node);
-#if DEBUG > 0
if (err != B_OK) {
TRACE("BSoundPlayer::~BSoundPlayer: Error releasing
input node: "
"%ld (%s)\n", err, strerror(err));
}
-#endif
}
cleanup:
diff --git a/src/kits/tracker/FSUtils.cpp b/src/kits/tracker/FSUtils.cpp
index 150225b..f85df2d 100644
--- a/src/kits/tracker/FSUtils.cpp
+++ b/src/kits/tracker/FSUtils.cpp
@@ -870,7 +870,6 @@ MoveTask(BObjectList<entry_ref> *srcList, BEntry
*destEntry, BList *pointList,
StatStruct deststat;
BVolume volume(srcVolumeDevice);
entry_ref destRef;
- const entry_ref *destRefToCheck = NULL;
bool destIsTrash = false;
BDirectory destDir;
@@ -885,7 +884,6 @@ MoveTask(BObjectList<entry_ref> *srcList, BEntry
*destEntry, BList *pointList,
// if we're not passed a destEntry then we are supposed to move to trash
if (destEntry != NULL) {
destEntry->GetRef(&destRef);
- destRefToCheck = &destRef;
destDir.SetTo(destEntry);
destDir.GetStat(&deststat);
@@ -913,7 +911,6 @@ MoveTask(BObjectList<entry_ref> *srcList, BEntry
*destEntry, BList *pointList,
destDirToCheck = &destDir;
entry.GetRef(&destRef);
- destRefToCheck = &destRef;
}
// change the move mode if needed
diff --git a/src/kits/tracker/FindPanel.cpp b/src/kits/tracker/FindPanel.cpp
index e2264c1..f2a1a12 100644
--- a/src/kits/tracker/FindPanel.cpp
+++ b/src/kits/tracker/FindPanel.cpp
@@ -433,10 +433,12 @@ FindWindow::SaveQueryAsAttributes(BNode *file, BEntry
*entry, bool queryTemplate
ssize_t size = message.FlattenedSize();
BString buffer;
status_t result =
message.Flatten(buffer.LockBuffer(size), size);
- ASSERT(result == B_OK);
- result = file->WriteAttr(kAttrQueryVolume,
B_MESSAGE_TYPE, 0,
- buffer.String(), (size_t)size);
- ASSERT(result == size);
+ if (result == B_OK) {
+ if (file->WriteAttr(kAttrQueryVolume,
B_MESSAGE_TYPE, 0,
+ buffer.String(), (size_t)size) != size)
{
+ return B_IO_ERROR;
+ }
+ }
buffer.UnlockBuffer();
}
// default to query for everything
@@ -2068,10 +2070,10 @@ FindPanel::SaveWindowState(BNode *node, bool
editTemplate)
ssize_t size = message.FlattenedSize();
char *buffer = new char[size];
status_t result = message.Flatten(buffer, size);
- ASSERT(result == B_OK);
- result =
node->WriteAttr(kAttrQueryInitialAttrs, B_MESSAGE_TYPE, 0,
- buffer, (size_t)size);
- ASSERT(result == size);
+ if (result == B_OK) {
+ node->WriteAttr(kAttrQueryInitialAttrs,
B_MESSAGE_TYPE, 0,
+ buffer, (size_t)size);
+ }
delete [] buffer;
}
break;
diff --git a/src/kits/tracker/MountMenu.cpp b/src/kits/tracker/MountMenu.cpp
index 24e1eb5..ea124ea 100644
--- a/src/kits/tracker/MountMenu.cpp
+++ b/src/kits/tracker/MountMenu.cpp
@@ -190,10 +190,8 @@ MountMenu::AddDynamicItem(add_state)
// by the autoMounter because they do not show up in the /dev tree
BVolumeRoster volumeRoster;
BVolume volume;
- bool needSeparator = false;
while (volumeRoster.GetNextVolume(&volume) == B_OK) {
if (volume.IsShared()) {
- needSeparator = true;
BBitmap *icon = new BBitmap(BRect(0, 0, 15, 15),
B_CMAP8);
fs_info info;
if (fs_stat_dev(volume.Device(), &info) != B_OK) {
diff --git a/src/kits/tracker/OpenWithWindow.cpp
b/src/kits/tracker/OpenWithWindow.cpp
index 8bc5385..cda26cb 100644
--- a/src/kits/tracker/OpenWithWindow.cpp
+++ b/src/kits/tracker/OpenWithWindow.cpp
@@ -592,7 +592,6 @@ AddOneRefSignatures(const entry_ref *ref, void
*castToIterator)
// if model is of unknown type, try mimeseting it first
model.Mimeset(true);
- bool preferredAppFromNode = false;
entry_ref preferredRef;
// add preferred app for file, if any
@@ -600,7 +599,6 @@ AddOneRefSignatures(const entry_ref *ref, void
*castToIterator)
// got one, mark it as preferred for this node
if (be_roster->FindApp(model.PreferredAppSignature(),
&preferredRef) == B_OK) {
queryIterator->PushUniqueSignature(model.PreferredAppSignature());
- preferredAppFromNode = true;
queryIterator->TrySettingPreferredAppForFile(&preferredRef);
}
}
diff --git a/src/kits/tracker/RecentItems.cpp b/src/kits/tracker/RecentItems.cpp
index 53ca018..1b8c8cd 100644
--- a/src/kits/tracker/RecentItems.cpp
+++ b/src/kits/tracker/RecentItems.cpp
@@ -284,11 +284,11 @@ BRecentItemsList::GetNextMenuItem(const BMessage
*fileOpenInvokeMessage,
// open the model, if it ain't open already
PoseInfo poseInfo;
- ssize_t size = -1;
- if (result->Node())
- size = result->Node()->ReadAttr(kAttrPoseInfo,
B_RAW_TYPE, 0,
+ if (result->Node()) {
+ result->Node()->ReadAttr(kAttrPoseInfo,
B_RAW_TYPE, 0,
&poseInfo, sizeof(poseInfo));
+ }
result->CloseNode();
diff --git a/src/kits/tracker/SlowContextPopup.cpp
b/src/kits/tracker/SlowContextPopup.cpp
index 6a12c9d..5c9ec17 100644
--- a/src/kits/tracker/SlowContextPopup.cpp
+++ b/src/kits/tracker/SlowContextPopup.cpp
@@ -320,12 +320,12 @@ BSlowContextMenu::AddNextItem()
return true;
}
- ssize_t size = -1;
PoseInfo poseInfo;
- if (model.Node())
- size = model.Node()->ReadAttr(kAttrPoseInfo, B_RAW_TYPE, 0,
+ if (model.Node()) {
+ model.Node()->ReadAttr(kAttrPoseInfo, B_RAW_TYPE, 0,
&poseInfo, sizeof(poseInfo));
+ }
model.CloseNode();
@@ -384,11 +384,11 @@ BSlowContextMenu::NewModelItem(Model *model, const
BMessage *invokeMessage,
// open the model, if it ain't open already
PoseInfo poseInfo;
- ssize_t size = -1;
- if (result->Node())
- size = result->Node()->ReadAttr(kAttrPoseInfo,
B_RAW_TYPE, 0,
+ if (result->Node()) {
+ result->Node()->ReadAttr(kAttrPoseInfo,
B_RAW_TYPE, 0,
&poseInfo, sizeof(poseInfo));
+ }
result->CloseNode();
diff --git a/src/kits/tracker/TrackerInitialState.cpp
b/src/kits/tracker/TrackerInitialState.cpp
index a6a3251..bfaf138 100644
--- a/src/kits/tracker/TrackerInitialState.cpp
+++ b/src/kits/tracker/TrackerInitialState.cpp
@@ -544,8 +544,8 @@ TTracker::InstallIndices()
void
TTracker::InstallIndices(dev_t device)
{
- status_t error = fs_create_index(device, kAttrQueryLastChange,
B_INT32_TYPE, 0);
- error = fs_create_index(device, "_trk/recentQuery", B_INT32_TYPE, 0);
+ fs_create_index(device, kAttrQueryLastChange, B_INT32_TYPE, 0);
+ fs_create_index(device, "_trk/recentQuery", B_INT32_TYPE, 0);
}
diff --git a/src/preferences/shortcuts/clv/CLVColumnLabelView.cpp
b/src/preferences/shortcuts/clv/CLVColumnLabelView.cpp
index 82819eb..e1ea8cc 100644
--- a/src/preferences/shortcuts/clv/CLVColumnLabelView.cpp
+++ b/src/preferences/shortcuts/clv/CLVColumnLabelView.cpp
@@ -538,7 +538,6 @@ void CLVColumnLabelView::ShiftDragGroup(int32 NewPos)
int32 NumberOfGroups = fDragGroups.CountItems();
int32 GroupCounter;
CLVDragGroup* ThisGroup;
- int32 NumberOfColumnsInGroup;
int32 ColumnCounter;
BList NewDisplayList;
@@ -548,8 +547,6 @@ void CLVColumnLabelView::ShiftDragGroup(int32 NewPos)
if(GroupCounter != fDragGroup)
{
ThisGroup =
(CLVDragGroup*)fDragGroups.ItemAt(GroupCounter);
- NumberOfColumnsInGroup =
ThisGroup->GroupStopDispListIndex -
- ThisGroup->GroupStartDispListIndex + 1;
for(ColumnCounter = ThisGroup->GroupStartDispListIndex;
ColumnCounter <=
ThisGroup->GroupStopDispListIndex;
ColumnCounter++)
NewDisplayList.AddItem(fDisplayList->ItemAt(ColumnCounter));
@@ -557,7 +554,6 @@ void CLVColumnLabelView::ShiftDragGroup(int32 NewPos)
}
//Copy the group into the new position
ThisGroup = (CLVDragGroup*)fDragGroups.ItemAt(fDragGroup);
- NumberOfColumnsInGroup = ThisGroup->GroupStopDispListIndex -
ThisGroup->GroupStartDispListIndex + 1;
for(ColumnCounter = ThisGroup->GroupStartDispListIndex; ColumnCounter <=
ThisGroup->GroupStopDispListIndex; ColumnCounter++)
NewDisplayList.AddItem(fDisplayList->ItemAt(ColumnCounter));
@@ -567,8 +563,6 @@ void CLVColumnLabelView::ShiftDragGroup(int32 NewPos)
if(GroupCounter != fDragGroup)
{
ThisGroup =
(CLVDragGroup*)fDragGroups.ItemAt(GroupCounter);
- NumberOfColumnsInGroup =
ThisGroup->GroupStopDispListIndex -
- ThisGroup->GroupStartDispListIndex + 1;
for(ColumnCounter = ThisGroup->GroupStartDispListIndex;
ColumnCounter <=
ThisGroup->GroupStopDispListIndex;
ColumnCounter++)
NewDisplayList.AddItem(fDisplayList->ItemAt(ColumnCounter));
diff --git a/src/servers/app/drawing/Painter/drawing_modes/DrawingModeInvert.h
b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeInvert.h
index 5fb8930..2a8e523 100644
--- a/src/servers/app/drawing/Painter/drawing_modes/DrawingModeInvert.h
+++ b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeInvert.h
@@ -17,6 +17,7 @@
pixel32 _p; \
_p.data32 = *(uint32*)d; \
BLEND(d, 255 - _p.data8[2], 255 - _p.data8[1], 255 - _p.data8[0], a); \
+ (void)_p; \
}
// ASSIGN_INVERT
diff --git
a/src/servers/app/drawing/Painter/drawing_modes/DrawingModeInvertSUBPIX.h
b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeInvertSUBPIX.h
index 4a548ee..bf39d6b 100644
--- a/src/servers/app/drawing/Painter/drawing_modes/DrawingModeInvertSUBPIX.h
+++ b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeInvertSUBPIX.h
@@ -20,6 +20,7 @@
_p.data32 = *(uint32*)d; \
BLEND_SUBPIX(d, 255 - _p.data8[2], 255 - _p.data8[1], 255 -
_p.data8[0], \
a1, a2, a3); \
+ (void)_p; \
}
diff --git a/src/servers/app/font/GlyphLayoutEngine.h
b/src/servers/app/font/GlyphLayoutEngine.h
index 7717fc2..63ec4d0 100644
--- a/src/servers/app/font/GlyphLayoutEngine.h
+++ b/src/servers/app/font/GlyphLayoutEngine.h
@@ -211,7 +211,7 @@ GlyphLayoutEngine::LayoutGlyphs(GlyphConsumer& consumer,
double advanceX = 0.0;
double advanceY = 0.0;
- uint32 lastCharCode = 0;
+// uint32 lastCharCode = 0;
uint32 charCode;
int32 index = 0;
bool writeLocked = false;
@@ -268,7 +268,7 @@ GlyphLayoutEngine::LayoutGlyphs(GlyphConsumer& consumer,
advanceY = glyph->advance_y;
}
- lastCharCode = charCode;
+// lastCharCode = charCode;
if (utf8String - start + 1 > length)
break;
}
diff --git a/src/servers/notification/AppGroupView.cpp
b/src/servers/notification/AppGroupView.cpp
index 1b3343f..5779b59 100644
--- a/src/servers/notification/AppGroupView.cpp
+++ b/src/servers/notification/AppGroupView.cpp
@@ -45,7 +45,6 @@ AppGroupView::Draw(BRect updateRect)
rgb_color menuColor = ViewColor();
BRect bounds = Bounds();
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);
bounds.bottom = bounds.top + kHeaderSize;
Other related posts:
