i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes some occurrences of 'variable set but not used', disables Werror for problematic items.

Browse Source
This commit is contained in:
Jerome Duval
2012-02-23 20:32:11 +01:00
parent 0d33f92c77
commit eb5f363978
17 changed files with 59 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+4 -4
View File
@@ -1222,7 +1222,7 @@ if $(HAIKU_NO_WERROR) != 1 {
# EnableWerror src add-ons accelerants nvidia ; # EnableWerror src add-ons accelerants nvidia ;
EnableWerror src add-ons accelerants nvidia_gpgpu ; EnableWerror src add-ons accelerants nvidia_gpgpu ;
# EnableWerror src add-ons accelerants radeon ; # 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 s3 ;
EnableWerror src add-ons accelerants skeleton ; EnableWerror src add-ons accelerants skeleton ;
EnableWerror src add-ons accelerants vesa ; 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 agp_gart ;
EnableWerror src add-ons kernel bus_managers ata ; EnableWerror src add-ons kernel bus_managers ata ;
EnableWerror src add-ons kernel bus_managers config_manager ; 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 isa ;
EnableWerror src add-ons kernel bus_managers pci ; EnableWerror src add-ons kernel bus_managers pci ;
# EnableWerror src add-ons kernel bus_managers ps2 ; # gcc2 # 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 rtf ;
EnableWerror src add-ons translators sgi ; EnableWerror src add-ons translators sgi ;
EnableWerror src add-ons translators shared ; 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 tga ;
EnableWerror src add-ons translators tiff ; 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 add-ons print ;
EnableWerror src bin package ; EnableWerror src bin package ;
EnableWerror src apps ; EnableWerror src apps ;
headers/private/firewire/fwglue.h
+1 -1
View File
@@ -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 wakeup(i) release_sem_etc(i->Sem, 0, B_RELEASE_IF_WAITING_ONLY | B_RELEASE_ALL)
#define splfw() 0 #define splfw() 0
#define splx(s) #define splx(s) (void)s
#define hz 1000000LL #define hz 1000000LL
src/add-ons/accelerants/neomagic/InitAccelerant.c
+1 -2
View File
@@ -260,13 +260,12 @@ a buffer at least ACCELERANT_CLONE_INFO_SIZE() bytes in length.
void GET_ACCELERANT_CLONE_INFO(void *data) void GET_ACCELERANT_CLONE_INFO(void *data)
{ {
nm_device_name dn; nm_device_name dn;
status_t result;
/* call the kernel driver to get the device name */ /* call the kernel driver to get the device name */
dn.magic = NM_PRIVATE_DATA_MAGIC; dn.magic = NM_PRIVATE_DATA_MAGIC;
/* store the returned info directly into the passed buffer */ /* store the returned info directly into the passed buffer */
dn.name = (char *)data; dn.name = (char *)data;
result = ioctl(fd, NM_DEVICE_NAME, &dn, sizeof(dn)); ioctl(fd, NM_DEVICE_NAME, &dn, sizeof(dn));
} }
/* /*
src/add-ons/accelerants/neomagic/SetDisplayMode.c
+6 -5
View File
@@ -6,6 +6,7 @@
Rudolf Cornelissen 4/2003-1/2006 Rudolf Cornelissen 4/2003-1/2006
*/ */
#define MODULE_BIT 0x00200000 #define MODULE_BIT 0x00200000
#include "acc_std.h" #include "acc_std.h"
@@ -14,21 +15,21 @@
Enable/Disable interrupts. Just a wrapper around the Enable/Disable interrupts. Just a wrapper around the
ioctl() to the kernel driver. 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; 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 */ /* set the magic number so the driver knows we're for real */
sbs.magic = NM_PRIVATE_DATA_MAGIC; sbs.magic = NM_PRIVATE_DATA_MAGIC;
sbs.do_it = flag; sbs.do_it = flag;
/* contact driver and get a pointer to the registers and shared data */ /* 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)! */ /* 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) status_t SET_DISPLAY_MODE(display_mode *mode_to_set)
{ {
src/add-ons/kernel/bus_managers/firewire/fwohci.cpp
+1
View File
@@ -780,6 +780,7 @@ fwohci_timeout(void *arg)
struct fwohci_softc *sc; struct fwohci_softc *sc;
sc = (struct fwohci_softc *)arg; sc = (struct fwohci_softc *)arg;
(void)sc;
} }
uint32_t uint32_t
src/add-ons/kernel/busses/usb/uhci.cpp
+2 -4
View File
@@ -772,19 +772,17 @@ UHCI::CheckDebugTransfer(DebugTransfer *transfer, bool &_stillPending)
} }
if (transferOK) { if (transferOK) {
size_t actualLength = 0;
uint8 lastDataToggle = 0; uint8 lastDataToggle = 0;
if (transfer->TransferPipe()->Direction() == Pipe::In) { if (transfer->TransferPipe()->Direction() == Pipe::In) {
// data to read out // data to read out
iovec *vector = transfer->Vector(); iovec *vector = transfer->Vector();
size_t vectorCount = transfer->VectorCount(); size_t vectorCount = transfer->VectorCount();
actualLength = ReadDescriptorChain(transfer->firstDescriptor, ReadDescriptorChain(transfer->firstDescriptor,
vector, vectorCount, &lastDataToggle); vector, vectorCount, &lastDataToggle);
} else { } else {
// read the actual length that was sent // read the actual length that was sent
actualLength = ReadActualLength(transfer->firstDescriptor, ReadActualLength(transfer->firstDescriptor, &lastDataToggle);
&lastDataToggle);
} }
transfer->TransferPipe()->SetDataToggle(lastDataToggle == 0); transfer->TransferPipe()->SetDataToggle(lastDataToggle == 0);
src/add-ons/kernel/drivers/disk/floppy/pc_floppy/floppy.c
+1 -2
View File
@@ -345,7 +345,6 @@ static status_t
flo_open(const char *name, uint32 flags, floppy_cookie **cookie) flo_open(const char *name, uint32 flags, floppy_cookie **cookie)
{ {
int i; int i;
status_t err;
TRACE("open(%s)\n", name); TRACE("open(%s)\n", name);
if (flags & O_NONBLOCK) if (flags & O_NONBLOCK)
return EINVAL; return EINVAL;
@@ -361,7 +360,7 @@ flo_open(const char *name, uint32 flags, floppy_cookie **cookie)
(*cookie)->flp = &(floppies[i]); (*cookie)->flp = &(floppies[i]);
/* if we don't know yet if there's something in, check that */ /* if we don't know yet if there's something in, check that */
if ((*cookie)->flp->status <= FLOP_MEDIA_CHANGED) if ((*cookie)->flp->status <= FLOP_MEDIA_CHANGED)
err = query_media((*cookie)->flp, false); query_media((*cookie)->flp, false);
return B_OK; return B_OK;
} }
src/add-ons/kernel/drivers/disk/virtual/nbd/nbd.c
+25 -7
View File
@@ -9,6 +9,7 @@
* Maps a Network Block Device as virtual partitions. * Maps a Network Block Device as virtual partitions.
*/ */
#include <ByteOrder.h> #include <ByteOrder.h>
#include <KernelExport.h> #include <KernelExport.h>
#include <Drivers.h> #include <Drivers.h>
@@ -226,6 +227,7 @@ err0:
return err; return err;
} }
status_t nbd_queue_request(struct nbd_device *dev, struct nbd_request_entry *req) status_t nbd_queue_request(struct nbd_device *dev, struct nbd_request_entry *req)
{ {
PRINT((DP ">%s(handle:%Ld)\n", __FUNCTION__, req->handle)); 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; return B_OK;
} }
status_t nbd_dequeue_request(struct nbd_device *dev, uint64 handle, struct nbd_request_entry **req) status_t nbd_dequeue_request(struct nbd_device *dev, uint64 handle, struct nbd_request_entry **req)
{ {
struct nbd_request_entry *r, *prev; 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; return B_OK;
} }
status_t nbd_free_request(struct nbd_device *dev, struct nbd_request_entry *req) status_t nbd_free_request(struct nbd_device *dev, struct nbd_request_entry *req)
{ {
PRINT((DP ">%s(handle:%Ld)\n", __FUNCTION__, req->handle)); 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 #if 0
#pragma mark ==== nbd handler ==== #pragma mark ==== nbd handler ====
#endif #endif
@@ -355,6 +358,7 @@ err:
return err; return err;
} }
status_t nbd_connect(struct nbd_device *dev) status_t nbd_connect(struct nbd_device *dev)
{ {
struct nbd_init_packet initpkt; struct nbd_init_packet initpkt;
@@ -415,17 +419,19 @@ err0:
return err; return err;
} }
status_t nbd_teardown(struct nbd_device *dev) status_t nbd_teardown(struct nbd_device *dev)
{ {
status_t err, ret; status_t ret;
PRINT((DP ">%s()\n", __FUNCTION__)); PRINT((DP ">%s()\n", __FUNCTION__));
kshutdown(dev->sock, SHUT_RDWR); kshutdown(dev->sock, SHUT_RDWR);
kclosesocket(dev->sock); kclosesocket(dev->sock);
dev->sock = -1; dev->sock = -1;
err = wait_for_thread(dev->postoffice, &ret); wait_for_thread(dev->postoffice, &ret);
return B_OK; return B_OK;
} }
status_t nbd_post_request(struct nbd_device *dev, struct nbd_request_entry *req) status_t nbd_post_request(struct nbd_device *dev, struct nbd_request_entry *req)
{ {
status_t err; 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 nbd_open(const char *name, uint32 flags, cookie_t **cookie) {
status_t err; status_t err;
int32 refcnt;
#ifdef MOUNT_KLUDGE #ifdef MOUNT_KLUDGE
int32 refcnt;
int kfd; int kfd;
#endif #endif
struct nbd_device *dev = NULL; 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); err = nbd_connect(dev);
if (err) if (err)
goto err2; goto err2;
refcnt = dev->refcnt++;
#ifdef MOUNT_KLUDGE #ifdef MOUNT_KLUDGE
refcnt = dev->refcnt++;
kfd = dev->kludge; kfd = dev->kludge;
dev->kludge = -1; dev->kludge = -1;
#endif #endif
@@ -507,6 +513,7 @@ err0:
return err; return err;
} }
status_t nbd_close(cookie_t *cookie) { status_t nbd_close(cookie_t *cookie) {
struct nbd_device *dev = cookie->dev; struct nbd_device *dev = cookie->dev;
status_t err; status_t err;
@@ -535,6 +542,7 @@ status_t nbd_close(cookie_t *cookie) {
return B_OK; return B_OK;
} }
status_t nbd_free(cookie_t *cookie) { status_t nbd_free(cookie_t *cookie) {
struct nbd_device *dev = cookie->dev; struct nbd_device *dev = cookie->dev;
status_t err; status_t err;
@@ -554,6 +562,7 @@ status_t nbd_free(cookie_t *cookie) {
return err; return err;
} }
status_t nbd_control(cookie_t *cookie, uint32 op, void *data, size_t len) { 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)); PRINT((DP ">%s(%d, %lu, , %ld)\n", __FUNCTION__, WHICH(cookie->dev), op, len));
switch (op) { switch (op) {
@@ -609,6 +618,7 @@ status_t nbd_control(cookie_t *cookie, uint32 op, void *data, size_t len) {
return B_NOT_ALLOWED; return B_NOT_ALLOWED;
} }
status_t nbd_read(cookie_t *cookie, off_t position, void *data, size_t *numbytes) { status_t nbd_read(cookie_t *cookie, off_t position, void *data, size_t *numbytes) {
struct nbd_device *dev = cookie->dev; struct nbd_device *dev = cookie->dev;
struct nbd_request_entry *req; struct nbd_request_entry *req;
@@ -677,6 +687,7 @@ err0:
return err; return err;
} }
status_t nbd_write(cookie_t *cookie, off_t position, const void *data, size_t *numbytes) { status_t nbd_write(cookie_t *cookie, off_t position, const void *data, size_t *numbytes) {
struct nbd_device *dev = cookie->dev; struct nbd_device *dev = cookie->dev;
struct nbd_request_entry *req; struct nbd_request_entry *req;
@@ -748,6 +759,7 @@ err0:
return err; return err;
} }
device_hooks nbd_hooks={ device_hooks nbd_hooks={
(device_open_hook)nbd_open, (device_open_hook)nbd_open,
(device_close_hook)nbd_close, (device_close_hook)nbd_close,
@@ -771,6 +783,7 @@ static char *nbd_name[MAX_NBDS+1] = {
NULL NULL
}; };
status_t status_t
init_hardware (void) init_hardware (void)
{ {
@@ -778,6 +791,7 @@ init_hardware (void)
return B_OK; return B_OK;
} }
status_t status_t
init_driver (void) init_driver (void)
{ {
@@ -849,22 +863,23 @@ init_driver (void)
return B_OK; return B_OK;
} }
void void
uninit_driver (void) uninit_driver (void)
{ {
status_t err;
int i; int i;
PRINT((DP ">%s()\n", __FUNCTION__)); PRINT((DP ">%s()\n", __FUNCTION__));
for (i = 0; i < MAX_NBDS; i++) { for (i = 0; i < MAX_NBDS; i++) {
free(nbd_name[i]); free(nbd_name[i]);
mutex_destroy(&nbd_devices[i].ben); mutex_destroy(&nbd_devices[i].ben);
} }
err = ksocket_cleanup(); ksocket_cleanup();
/* HACK */ /* HACK */
if (gDelayUnload) if (gDelayUnload)
snooze(BONE_TEARDOWN_DELAY); snooze(BONE_TEARDOWN_DELAY);
} }
const char** const char**
publish_devices() publish_devices()
{ {
@@ -872,6 +887,7 @@ publish_devices()
return (const char **)nbd_name; return (const char **)nbd_name;
} }
device_hooks* device_hooks*
find_device(const char* name) find_device(const char* name)
{ {
@@ -879,6 +895,7 @@ find_device(const char* name)
return &nbd_hooks; return &nbd_hooks;
} }
struct nbd_device* struct nbd_device*
nbd_find_device(const char* name) nbd_find_device(const char* name)
{ {
@@ -892,3 +909,4 @@ nbd_find_device(const char* name)
} }
return NULL; return NULL;
} }
src/add-ons/kernel/drivers/ports/usb_serial/ACM.cpp
-2
View File
@@ -26,7 +26,6 @@ ACMDevice::AddDevice(const usb_configuration_info *config)
uint8 slaveIndex = 0; uint8 slaveIndex = 0;
usb_cdc_cm_functional_descriptor* cmDesc = NULL; usb_cdc_cm_functional_descriptor* cmDesc = NULL;
usb_cdc_union_functional_descriptor* unionDesc = NULL; usb_cdc_union_functional_descriptor* unionDesc = NULL;
usb_cdc_acm_functional_descriptor* acmDesc = NULL;
// Search ACM Communication Interface // Search ACM Communication Interface
for (size_t i = 0; i < config->interface_count && status < B_OK; i++) { 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; break;
case USB_CDC_ACM_FUNCTIONAL_DESCRIPTOR: case USB_CDC_ACM_FUNCTIONAL_DESCRIPTOR:
acmDesc = (usb_cdc_acm_functional_descriptor*)generic;
break; break;
case USB_CDC_UNION_FUNCTIONAL_DESCRIPTOR: case USB_CDC_UNION_FUNCTIONAL_DESCRIPTOR:
src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
-2
View File
@@ -1189,13 +1189,11 @@ bfs_rename(fs_volume* _volume, fs_vnode* _oldDir, const char* oldName,
newDirectory->ID(), newName); newDirectory->ID(), newName);
// update the name only when they differ // update the name only when they differ
bool nameUpdated = false;
if (strcmp(oldName, newName)) { if (strcmp(oldName, newName)) {
status = inode->SetName(transaction, newName); status = inode->SetName(transaction, newName);
if (status == B_OK) { if (status == B_OK) {
Index index(volume); Index index(volume);
index.UpdateName(transaction, oldName, newName, inode); index.UpdateName(transaction, oldName, newName, inode);
nameUpdated = true;
} }
} }
src/add-ons/kernel/file_systems/iso9660/iso9660.cpp
+7 -7
View File
@@ -292,7 +292,6 @@ parse_rock_ridge(iso9660_volume* volume, iso9660_inode* node, char* buffer,
char* slName = NULL; char* slName = NULL;
uint16 altNameSize = 0; uint16 altNameSize = 0;
uint16 slNameSize = 0; uint16 slNameSize = 0;
uint8 slFlags = 0;
uint8 length = 0; uint8 length = 0;
bool done = false; bool done = false;
@@ -358,7 +357,6 @@ parse_rock_ridge(iso9660_volume* volume, iso9660_inode* node, char* buffer,
case 'SL': case 'SL':
{ {
uint8 bytePos = 3; uint8 bytePos = 3;
uint8 lastCompFlag = 0;
uint8 addPos = 0; uint8 addPos = 0;
bool slDone = false; bool slDone = false;
bool useSeparator = true; 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)); TRACE(("Current length is %u\n", slNameSize));
//kernel_debugger(""); //kernel_debugger("");
node->attr.slVer = *(uint8*)(buffer + bytePos++); 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)); TRACE(("sl flags are %u\n", slFlags));
#endif
while (!slDone && bytePos < length) { while (!slDone && bytePos < length) {
uint8 compFlag = *(uint8*)(buffer + bytePos++); uint8 compFlag = *(uint8*)(buffer + bytePos++);
uint8 compLen = *(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) if (slName != NULL)
slName[slNameSize] = '\0'; slName[slNameSize] = '\0';
lastCompFlag = compFlag;
bytePos += compLen; bytePos += compLen;
TRACE(("Current sl name is \'%s\'\n", slName)); 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; off_t offset = 0x8000;
ssize_t retval; ssize_t retval;
partition_info partitionInfo; partition_info partitionInfo;
int deviceBlockSize, multiplier; int deviceBlockSize;
iso9660_volume *volume; iso9660_volume *volume;
(void)flags; (void)flags;
@@ -642,8 +640,10 @@ ISOMount(const char *path, uint32 flags, iso9660_volume **_newVolume,
volume->id = ISO_ROOTNODE_ID; volume->id = ISO_ROOTNODE_ID;
TRACE(("ISO9660: volume->blockSize = %d\n", volume->logicalBlkSize[FS_DATA_FORMAT])); 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)); TRACE(("ISOMount: block size multiplier is %d\n", multiplier));
#endif
// if the session is on a real device, size != 0 // if the session is on a real device, size != 0
if (partitionInfo.size != 0) { if (partitionInfo.size != 0) {
src/add-ons/kernel/file_systems/nfs/nfs_add_on.c
+3 -7
View File
@@ -856,7 +856,6 @@ fs_release_vnode(fs_volume *_volume, fs_vnode *node, bool r)
static status_t static status_t
fs_walk(fs_volume *_volume, fs_vnode *_base, const char *file, ino_t *vnid) fs_walk(fs_volume *_volume, fs_vnode *_base, const char *file, ino_t *vnid)
{ {
bool isLink;
fs_node *dummy; fs_node *dummy;
status_t result; status_t result;
fs_nspace *ns; 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; ns = _volume->private_volume;
base = _base->private_node; base = _base->private_node;
if (!strcmp(".", file)) { if (!strcmp(".", file))
*vnid = base->vnid; *vnid = base->vnid;
isLink = false; else {
} else {
fs_node *newNode = (fs_node *)malloc(sizeof(fs_node)); fs_node *newNode = (fs_node *)malloc(sizeof(fs_node));
struct stat st; struct stat st;
@@ -884,8 +882,6 @@ fs_walk(fs_volume *_volume, fs_vnode *_base, const char *file, ino_t *vnid)
*vnid = newNode->vnid; *vnid = newNode->vnid;
insert_node(ns, newNode); insert_node(ns, newNode);
isLink = S_ISLNK(st.st_mode);
} }
if ((result = get_vnode (_volume, *vnid, (void **)&dummy)) < B_OK) 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); status = XDRInPacketGetInt32(&reply);
/* if (status!=NFS_OK) /* if (status!=NFS_OK)
return map_nfs_to_system_error(status); return map_nfs_to_system_error(status);
ignore status here, weird thing, nfsservers that is ignore status here, weird thing, nfsservers that is
*/ */
(void)status;
result = nfs_lookup(ns, &dir->fhandle, name, &fhandle, &st); result = nfs_lookup(ns, &dir->fhandle, name, &fhandle, &st);
src/add-ons/kernel/file_systems/udf/Recognition.cpp
-4
View File
@@ -109,11 +109,9 @@ walk_volume_recognition_sequence(int device, off_t offset, uint32 blockSize,
return B_ERROR; return B_ERROR;
} }
bool foundISO = false;
bool foundExtended = false; bool foundExtended = false;
bool foundECMA167 = false; bool foundECMA167 = false;
bool foundECMA168 = false; bool foundECMA168 = false;
bool foundBoot = false;
for (uint32 block = 16; true; block++) { for (uint32 block = 16; true; block++) {
off_t address = (offset + block) << blockShift; off_t address = (offset + block) << blockShift;
TRACE(("walk_volume_recognition_sequence: block = %ld, " 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()); = (volume_structure_descriptor_header *)(chunk.Data());
if (descriptor->id_matches(kVSDID_ISO)) { if (descriptor->id_matches(kVSDID_ISO)) {
TRACE(("found ISO9660 descriptor\n")); TRACE(("found ISO9660 descriptor\n"));
foundISO = true;
} else if (descriptor->id_matches(kVSDID_BEA)) { } else if (descriptor->id_matches(kVSDID_BEA)) {
TRACE(("found BEA descriptor\n")); TRACE(("found BEA descriptor\n"));
foundExtended = true; foundExtended = true;
@@ -139,7 +136,6 @@ walk_volume_recognition_sequence(int device, off_t offset, uint32 blockSize,
foundECMA167 = true; foundECMA167 = true;
} else if (descriptor->id_matches(kVSDID_BOOT)) { } else if (descriptor->id_matches(kVSDID_BOOT)) {
TRACE(("found boot descriptor\n")); TRACE(("found boot descriptor\n"));
foundBoot = true;
} else if (descriptor->id_matches(kVSDID_ECMA168)) { } else if (descriptor->id_matches(kVSDID_ECMA168)) {
TRACE(("found ECMA-168 descriptor\n")); TRACE(("found ECMA-168 descriptor\n"));
foundECMA168 = true; foundECMA168 = true;
src/add-ons/kernel/generic/mpu401/mpu401.c
+1 -5
View File
@@ -279,13 +279,11 @@ midi_read(void *cookie, off_t pos, void *buffer, size_t *num_bytes)
unsigned char *data; unsigned char *data;
unsigned int i; unsigned int i;
size_t count;
cpu_status status; cpu_status status;
status_t bestat; status_t bestat;
mpu401device *mpu_device = (mpu401device *)cookie; mpu401device *mpu_device = (mpu401device *)cookie;
data = (unsigned char*)buffer; data = (unsigned char*)buffer;
count = *(num_bytes);
i = 0; i = 0;
*num_bytes = 0; *num_bytes = 0;
@@ -358,7 +356,6 @@ midi_write(void * cookie, off_t pos, const void * data, size_t * num_bytes)
static bool static bool
interrupt_hook(void * cookie) interrupt_hook(void * cookie)
{ {
status_t bestat;
mpu401device *mpu_device = (mpu401device *)cookie; mpu401device *mpu_device = (mpu401device *)cookie;
/* Only for deep debugging..will slow things down */ /* Only for deep debugging..will slow things down */
@@ -381,8 +378,7 @@ interrupt_hook(void * cookie)
mbuf_current++; /* pointer to next blank byte */ mbuf_current++; /* pointer to next blank byte */
mbuf_bytes++; /* increment count of midi data bytes */ mbuf_bytes++; /* increment count of midi data bytes */
bestat = release_sem_etc(mpu_device->readsemaphore, 1, release_sem_etc(mpu_device->readsemaphore, 1, B_DO_NOT_RESCHEDULE);
B_DO_NOT_RESCHEDULE);
return TRUE; //B_INVOKE_SCHEDULER return TRUE; //B_INVOKE_SCHEDULER
} }
src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp
+2 -2
View File
@@ -2143,7 +2143,7 @@ return B_OK;
// char oldValues[128]; // char oldValues[128];
char newValues[128]; char newValues[128];
size_t oldValuesSize; // size_t oldValuesSize;
size_t newValuesSize; size_t newValuesSize;
for (int i = 0; i < mixer->CountExtInfos(); i++) { for (int i = 0; i < mixer->CountExtInfos(); i++) {
@@ -2177,7 +2177,7 @@ return B_OK;
// if (!parameter) // if (!parameter)
// continue; // continue;
oldValuesSize = 128; // oldValuesSize = 128;
newValuesSize = 128; newValuesSize = 128;
bigtime_t last; bigtime_t last;
// TRACE("OpenSoundNode::%s: comparing mixer control %d\n", // TRACE("OpenSoundNode::%s: comparing mixer control %d\n",
src/add-ons/translators/raw/RAW.cpp
+4 -2
View File
@@ -951,7 +951,7 @@ DCRaw::_ScaleColors()
if (fProgressMonitor != NULL) if (fProgressMonitor != NULL)
fProgressMonitor("Scale Colors", 5, fProgressData); fProgressMonitor("Scale Colors", 5, fProgressData);
int dblack, c, val, sum[8]; int c, val, sum[8];
uint32 row, col, x, y; uint32 row, col, x, y;
double dsum[8], dmin, dmax; double dsum[8], dmin, dmax;
float scale_mul[4]; float scale_mul[4];
@@ -1020,7 +1020,9 @@ DCRaw::_ScaleColors()
if (fMeta.pre_multipliers[3] == 0) if (fMeta.pre_multipliers[3] == 0)
fMeta.pre_multipliers[3] = fColors < 4 ? fMeta.pre_multipliers[1] : 1; fMeta.pre_multipliers[3] = fColors < 4 ? fMeta.pre_multipliers[1] : 1;
dblack = fMeta.black; #if 0
int dblack = fMeta.black;
#endif
if (fThreshold) if (fThreshold)
_WaveletDenoise(); _WaveletDenoise();
src/add-ons/translators/rtf/main.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ main(int argc, char** argv)
convert_to_plain_text(header, output); convert_to_plain_text(header, output);
} }
return 1; return result;
} }
BApplication app("application/x-vnd.Haiku-RTFTranslator"); BApplication app("application/x-vnd.Haiku-RTFTranslator");