From a8f9741c8c2815234e87b78167738057b976b537 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Fri, 4 Jul 2008 23:14:19 +0000 Subject: [PATCH] * Removed -Wno-unused from all KernelMergeObjects in kernel Jamfiles. * Fixed most of the warnings resulting from that by removing actually not used variables or moving declaration into the #IF. Left unused functions there though, as I wouldn't know if they are supposed to be used again. * Fixed two statements with no effect (clamping to MAX_ANCILLARY_DATA_LEN in socket.cpp and unsetting fCounterSem in MessagingService.cpp). * Some style cleanups. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26253 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/kernel/arch/x86/Jamfile | 2 +- src/system/kernel/arch/x86/arch_cpu.c | 101 +++++++++--------- src/system/kernel/arch/x86/arch_debug.cpp | 3 +- .../kernel/arch/x86/arch_debug_console.c | 2 +- src/system/kernel/arch/x86/arch_thread.cpp | 1 - .../kernel/arch/x86/arch_user_debugger.cpp | 4 - src/system/kernel/cache/Jamfile | 2 +- src/system/kernel/debug/Jamfile | 2 +- src/system/kernel/debug/debug.cpp | 3 - src/system/kernel/debug/debug_commands.cpp | 1 - src/system/kernel/debug/debug_variables.cpp | 3 - src/system/kernel/debug/user_debugger.cpp | 1 - src/system/kernel/device_manager/Jamfile | 2 +- src/system/kernel/device_manager/devfs.cpp | 5 +- .../kernel/device_manager/device_manager.cpp | 2 - .../kernel/device_manager/legacy_drivers.cpp | 11 +- src/system/kernel/disk_device_manager/Jamfile | 2 +- src/system/kernel/fs/Jamfile | 2 +- src/system/kernel/fs/fd.cpp | 2 - src/system/kernel/fs/socket.cpp | 2 +- src/system/kernel/fs/vfs.cpp | 12 --- src/system/kernel/fs/vfs_net_boot.cpp | 2 - src/system/kernel/messaging/Jamfile | 2 +- .../kernel/messaging/MessagingService.cpp | 2 +- src/system/kernel/posix/Jamfile | 2 +- src/system/kernel/slab/Jamfile | 2 +- src/system/kernel/util/Jamfile | 2 +- src/system/kernel/vm/Jamfile | 2 +- 28 files changed, 66 insertions(+), 113 deletions(-) diff --git a/src/system/kernel/arch/x86/Jamfile b/src/system/kernel/arch/x86/Jamfile index 570ad2cf4c..30ca268e99 100644 --- a/src/system/kernel/arch/x86/Jamfile +++ b/src/system/kernel/arch/x86/Jamfile @@ -38,7 +38,7 @@ KernelMergeObject kernel_arch_x86.o : generic_vm_physical_page_mapper.cpp : - $(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused + $(TARGET_KERNEL_PIC_CCFLAGS) ; CreateAsmStructOffsetsHeader asm_offsets.h : asm_offsets.cpp ; diff --git a/src/system/kernel/arch/x86/arch_cpu.c b/src/system/kernel/arch/x86/arch_cpu.c index e175e56565..d936f9ddd6 100644 --- a/src/system/kernel/arch/x86/arch_cpu.c +++ b/src/system/kernel/arch/x86/arch_cpu.c @@ -159,8 +159,6 @@ x86_count_mtrrs(void) void x86_set_mtrr(uint32 index, uint64 base, uint64 length, uint8 type) { - cpu_status state; - struct set_mtrr_parameter parameter; parameter.index = index; parameter.base = base; @@ -242,89 +240,89 @@ make_feature_string(cpu_ent *cpu, char *str, size_t strlen) { str[0] = 0; - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_FPU) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_FPU) strlcat(str, "fpu ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_VME) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_VME) strlcat(str, "vme ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_DE) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_DE) strlcat(str, "de ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_PSE) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_PSE) strlcat(str, "pse ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_TSC) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_TSC) strlcat(str, "tsc ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_MSR) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_MSR) strlcat(str, "msr ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_PAE) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_PAE) strlcat(str, "pae ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_MCE) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_MCE) strlcat(str, "mce ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_CX8) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_CX8) strlcat(str, "cx8 ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_APIC) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_APIC) strlcat(str, "apic ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_SEP) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_SEP) strlcat(str, "sep ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_MTRR) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_MTRR) strlcat(str, "mtrr ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_PGE) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_PGE) strlcat(str, "pge ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_MCA) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_MCA) strlcat(str, "mca ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_CMOV) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_CMOV) strlcat(str, "cmov ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_PAT) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_PAT) strlcat(str, "pat ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_PSE36) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_PSE36) strlcat(str, "pse36 ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_PSN) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_PSN) strlcat(str, "psn ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_CLFSH) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_CLFSH) strlcat(str, "clfsh ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_DS) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_DS) strlcat(str, "ds ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_ACPI) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_ACPI) strlcat(str, "acpi ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_MMX) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_MMX) strlcat(str, "mmx ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_FXSR) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_FXSR) strlcat(str, "fxsr ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_SSE) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_SSE) strlcat(str, "sse ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_SSE2) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_SSE2) strlcat(str, "sse2 ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_SS) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_SS) strlcat(str, "ss ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_HTT) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_HTT) strlcat(str, "htt ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_TM) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_TM) strlcat(str, "tm ", strlen); - if(cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_PBE) + if (cpu->arch.feature[FEATURE_COMMON] & IA32_FEATURE_PBE) strlcat(str, "pbe ", strlen); - if(cpu->arch.feature[FEATURE_EXT] & IA32_FEATURE_EXT_SSE3) + if (cpu->arch.feature[FEATURE_EXT] & IA32_FEATURE_EXT_SSE3) strlcat(str, "sse3 ", strlen); - if(cpu->arch.feature[FEATURE_EXT] & IA32_FEATURE_EXT_MONITOR) + if (cpu->arch.feature[FEATURE_EXT] & IA32_FEATURE_EXT_MONITOR) strlcat(str, "monitor ", strlen); - if(cpu->arch.feature[FEATURE_EXT] & IA32_FEATURE_EXT_DSCPL) + if (cpu->arch.feature[FEATURE_EXT] & IA32_FEATURE_EXT_DSCPL) strlcat(str, "dscpl ", strlen); - if(cpu->arch.feature[FEATURE_EXT] & IA32_FEATURE_EXT_EST) + if (cpu->arch.feature[FEATURE_EXT] & IA32_FEATURE_EXT_EST) strlcat(str, "est ", strlen); - if(cpu->arch.feature[FEATURE_EXT] & IA32_FEATURE_EXT_TM2) + if (cpu->arch.feature[FEATURE_EXT] & IA32_FEATURE_EXT_TM2) strlcat(str, "tm2 ", strlen); - if(cpu->arch.feature[FEATURE_EXT] & IA32_FEATURE_EXT_CNXTID) + if (cpu->arch.feature[FEATURE_EXT] & IA32_FEATURE_EXT_CNXTID) strlcat(str, "cnxtid ", strlen); - if(cpu->arch.feature[FEATURE_EXT_AMD] & IA32_FEATURE_AMD_EXT_SYSCALL) + if (cpu->arch.feature[FEATURE_EXT_AMD] & IA32_FEATURE_AMD_EXT_SYSCALL) strlcat(str, "syscall ", strlen); - if(cpu->arch.feature[FEATURE_EXT_AMD] & IA32_FEATURE_AMD_EXT_NX) + if (cpu->arch.feature[FEATURE_EXT_AMD] & IA32_FEATURE_AMD_EXT_NX) strlcat(str, "nx ", strlen); - if(cpu->arch.feature[FEATURE_EXT_AMD] & IA32_FEATURE_AMD_EXT_MMXEXT) + if (cpu->arch.feature[FEATURE_EXT_AMD] & IA32_FEATURE_AMD_EXT_MMXEXT) strlcat(str, "mmxext ", strlen); - if(cpu->arch.feature[FEATURE_EXT_AMD] & IA32_FEATURE_AMD_EXT_FFXSR) + if (cpu->arch.feature[FEATURE_EXT_AMD] & IA32_FEATURE_AMD_EXT_FFXSR) strlcat(str, "ffxsr ", strlen); - if(cpu->arch.feature[FEATURE_EXT_AMD] & IA32_FEATURE_AMD_EXT_LONG) + if (cpu->arch.feature[FEATURE_EXT_AMD] & IA32_FEATURE_AMD_EXT_LONG) strlcat(str, "long ", strlen); - if(cpu->arch.feature[FEATURE_EXT_AMD] & IA32_FEATURE_AMD_EXT_3DNOWEXT) + if (cpu->arch.feature[FEATURE_EXT_AMD] & IA32_FEATURE_AMD_EXT_3DNOWEXT) strlcat(str, "3dnowext ", strlen); - if(cpu->arch.feature[FEATURE_EXT_AMD] & IA32_FEATURE_AMD_EXT_3DNOW) + if (cpu->arch.feature[FEATURE_EXT_AMD] & IA32_FEATURE_AMD_EXT_3DNOW) strlcat(str, "3dnow ", strlen); } @@ -333,7 +331,6 @@ static int detect_cpu(int curr_cpu) { cpuid_info cpuid; - unsigned int data[4]; char vendor_str[17]; int i; cpu_ent *cpu = get_cpu_struct(); @@ -369,13 +366,13 @@ detect_cpu(int curr_cpu) // figure out what vendor we have here - for(i=0; iarch.vendor = i; cpu->arch.vendor_name = vendor_info[i].vendor; break; } - if(vendor_info[i].ident_string[1] && !strcmp(vendor_str, vendor_info[i].ident_string[1])) { + if (vendor_info[i].ident_string[1] && !strcmp(vendor_str, vendor_info[i].ident_string[1])) { cpu->arch.vendor = i; cpu->arch.vendor_name = vendor_info[i].vendor; break; @@ -384,7 +381,7 @@ detect_cpu(int curr_cpu) // see if we can get the model name get_current_cpuid(&cpuid, 0x80000000); - if(cpuid.eax_0.max_eax >= 0x80000004) { + if (cpuid.eax_0.max_eax >= 0x80000004) { // build the model string (need to swap ecx/edx data before copying) unsigned int temp; memset(cpu->arch.model_name, 0, sizeof(cpu->arch.model_name)); @@ -399,9 +396,9 @@ detect_cpu(int curr_cpu) memcpy(cpu->arch.model_name + 32, cpuid.as_chars, sizeof(cpuid.as_chars)); // some cpus return a right-justified string - for(i = 0; cpu->arch.model_name[i] == ' '; i++) + for (i = 0; cpu->arch.model_name[i] == ' '; i++) ; - if(i > 0) { + if (i > 0) { memmove(cpu->arch.model_name, &cpu->arch.model_name[i], strlen(&cpu->arch.model_name[i]) + 1); @@ -417,7 +414,7 @@ detect_cpu(int curr_cpu) get_current_cpuid(&cpuid, 1); cpu->arch.feature[FEATURE_COMMON] = cpuid.eax_1.features; // edx cpu->arch.feature[FEATURE_EXT] = cpuid.eax_1.extended_features; // ecx - if(cpu->arch.vendor == VENDOR_AMD) { + if (cpu->arch.vendor == VENDOR_AMD) { get_current_cpuid(&cpuid, 0x80000001); cpu->arch.feature[FEATURE_EXT_AMD] = cpuid.regs.edx; // edx } diff --git a/src/system/kernel/arch/x86/arch_debug.cpp b/src/system/kernel/arch/x86/arch_debug.cpp index 855b8eaaa1..e15a6bb021 100644 --- a/src/system/kernel/arch/x86/arch_debug.cpp +++ b/src/system/kernel/arch/x86/arch_debug.cpp @@ -270,7 +270,7 @@ stack_trace(int argc, char **argv) struct thread *thread = NULL; addr_t oldPageDirectory = 0; uint32 ebp = x86_read_ebp(); - int32 i, num = 0, last = 0; + int32 num = 0, last = 0; setup_for_thread(argc == 2 ? argv[1] : NULL, &thread, &ebp, &oldPageDirectory); @@ -490,7 +490,6 @@ dump_iframes(int argc, char **argv) } struct thread *thread = NULL; - int32 i; if (argc < 2) { thread = thread_get_current_thread(); diff --git a/src/system/kernel/arch/x86/arch_debug_console.c b/src/system/kernel/arch/x86/arch_debug_console.c index d1bfa72ecf..b021fdee1a 100644 --- a/src/system/kernel/arch/x86/arch_debug_console.c +++ b/src/system/kernel/arch/x86/arch_debug_console.c @@ -186,7 +186,7 @@ arch_debug_blue_screen_getchar(void) static bool altPressed = false; static uint8 special = 0; static uint8 special2 = 0; - uint8 key, ascii = 0; + uint8 key = 0; if (special & 0x80) { special &= ~0x80; diff --git a/src/system/kernel/arch/x86/arch_thread.cpp b/src/system/kernel/arch/x86/arch_thread.cpp index 40ded08709..20a878d6b3 100644 --- a/src/system/kernel/arch/x86/arch_thread.cpp +++ b/src/system/kernel/arch/x86/arch_thread.cpp @@ -310,7 +310,6 @@ status_t arch_thread_init_tls(struct thread *thread) { uint32 tls[TLS_USER_THREAD_SLOT + 1]; - int32 i; thread->user_local_storage = thread->user_stack_base + thread->user_stack_size; diff --git a/src/system/kernel/arch/x86/arch_user_debugger.cpp b/src/system/kernel/arch/x86/arch_user_debugger.cpp index 7d9b70f05f..f534a0aa40 100644 --- a/src/system/kernel/arch/x86/arch_user_debugger.cpp +++ b/src/system/kernel/arch/x86/arch_user_debugger.cpp @@ -530,8 +530,6 @@ void arch_set_debug_cpu_state(const struct debug_cpu_state *cpuState) { if (struct iframe *frame = i386_get_user_iframe()) { - struct thread *thread = thread_get_current_thread(); - i386_frstor(cpuState->extended_regs); // For this to be correct the calling function must not use these // registers (not even indirectly). @@ -564,8 +562,6 @@ void arch_get_debug_cpu_state(struct debug_cpu_state *cpuState) { if (struct iframe *frame = i386_get_user_iframe()) { - struct thread *thread = thread_get_current_thread(); - i386_fnsave(cpuState->extended_regs); // For this to be correct the calling function must not use these // registers (not even indirectly). diff --git a/src/system/kernel/cache/Jamfile b/src/system/kernel/cache/Jamfile index 553704f072..e1fc85fe96 100644 --- a/src/system/kernel/cache/Jamfile +++ b/src/system/kernel/cache/Jamfile @@ -6,5 +6,5 @@ KernelMergeObject kernel_cache.o : file_map.cpp vnode_store.cpp - : $(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused + : $(TARGET_KERNEL_PIC_CCFLAGS) ; diff --git a/src/system/kernel/debug/Jamfile b/src/system/kernel/debug/Jamfile index 723a1575c0..badf1e5005 100644 --- a/src/system/kernel/debug/Jamfile +++ b/src/system/kernel/debug/Jamfile @@ -17,5 +17,5 @@ KernelMergeObject kernel_debug.o : tracing.cpp user_debugger.cpp - : $(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused + : $(TARGET_KERNEL_PIC_CCFLAGS) ; diff --git a/src/system/kernel/debug/debug.cpp b/src/system/kernel/debug/debug.cpp index 08ee4665d4..664ce55d09 100644 --- a/src/system/kernel/debug/debug.cpp +++ b/src/system/kernel/debug/debug.cpp @@ -87,7 +87,6 @@ static const uint32 kMaxDebuggerModules = sizeof(sDebuggerModules) #define HISTORY_SIZE 16 static char sLineBuffer[HISTORY_SIZE][LINE_BUFFER_SIZE] = { "", }; -static char sParseLine[LINE_BUFFER_SIZE]; static int32 sCurrentLine = 0; #define distance(a, b) ((a) < (b) ? (b) - (a) : (a) - (b)) @@ -880,8 +879,6 @@ syslog_init(struct kernel_args *args) syslog_write(revisionBuffer, length); return B_OK; -err3: - free(sSyslogBuffer); err2: free(sSyslogMessage); err1: diff --git a/src/system/kernel/debug/debug_commands.cpp b/src/system/kernel/debug/debug_commands.cpp index ea42af7f64..6e6bc890eb 100644 --- a/src/system/kernel/debug/debug_commands.cpp +++ b/src/system/kernel/debug/debug_commands.cpp @@ -392,7 +392,6 @@ sort_debugger_commands() } if (strcmp((*command)->name, nextCommand->name) > 0) { - debugger_command* tmpCommand = nextCommand->next; (*command)->next = nextCommand->next; nextCommand->next = *command; *command = nextCommand; diff --git a/src/system/kernel/debug/debug_variables.cpp b/src/system/kernel/debug/debug_variables.cpp index c08308e891..8950f9c8f8 100644 --- a/src/system/kernel/debug/debug_variables.cpp +++ b/src/system/kernel/debug/debug_variables.cpp @@ -109,9 +109,6 @@ free_temporary_variable_slot() static Variable* get_variable(const char* variableName, bool create) { - Variable* variables; - int variableCount; - // find the variable in the respective array and a free slot, we can // use, if it doesn't exist yet Variable* freeSlot = NULL; diff --git a/src/system/kernel/debug/user_debugger.cpp b/src/system/kernel/debug/user_debugger.cpp index af6fb00651..9ac22a85d1 100644 --- a/src/system/kernel/debug/user_debugger.cpp +++ b/src/system/kernel/debug/user_debugger.cpp @@ -2214,7 +2214,6 @@ void _user_debugger(const char *userMessage) { // install the default debugger, if there is none yet - struct thread *thread = thread_get_current_thread(); port_id nubPort; status_t error = ensure_debugger_installed(B_CURRENT_TEAM, &nubPort); if (error != B_OK) { diff --git a/src/system/kernel/device_manager/Jamfile b/src/system/kernel/device_manager/Jamfile index 3596506d09..3fb122bbe3 100644 --- a/src/system/kernel/device_manager/Jamfile +++ b/src/system/kernel/device_manager/Jamfile @@ -13,5 +13,5 @@ KernelMergeObject kernel_device_manager.o : # probe.cpp settings.cpp : - $(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused + $(TARGET_KERNEL_PIC_CCFLAGS) ; diff --git a/src/system/kernel/device_manager/devfs.cpp b/src/system/kernel/device_manager/devfs.cpp index 957134dc62..b3e40ead12 100644 --- a/src/system/kernel/device_manager/devfs.cpp +++ b/src/system/kernel/device_manager/devfs.cpp @@ -1190,7 +1190,6 @@ devfs_read_link(fs_volume *_volume, fs_vnode *_link, char *buffer, size_t *_bufferSize) { struct devfs_vnode *link = (struct devfs_vnode *)_link->private_node; - size_t bufferSize = *_bufferSize; if (!S_ISLNK(link->stream.type)) return B_BAD_VALUE; @@ -1461,7 +1460,6 @@ static status_t devfs_ioctl(fs_volume *_volume, fs_vnode *_vnode, void *_cookie, ulong op, void *buffer, size_t length) { - struct devfs *fs = (struct devfs *)_volume->private_volume; struct devfs_vnode *vnode = (struct devfs_vnode *)_vnode->private_node; struct devfs_cookie *cookie = (struct devfs_cookie *)_cookie; @@ -1499,8 +1497,8 @@ devfs_ioctl(fs_volume *_volume, fs_vnode *_vnode, void *_cookie, ulong op, case B_GET_DRIVER_FOR_DEVICE: { - const char* path; #if 0 + const char* path; if (!vnode->stream.u.dev.driver) return B_ENTRY_NOT_FOUND; path = vnode->stream.u.dev.driver->path; @@ -1531,7 +1529,6 @@ devfs_ioctl(fs_volume *_volume, fs_vnode *_vnode, void *_cookie, ulong op, case B_GET_PATH_FOR_DEVICE: { char path[256]; - status_t err; /* TODO: we might want to actually find the mountpoint * of that instance of devfs... * but for now we assume it's mounted on /dev diff --git a/src/system/kernel/device_manager/device_manager.cpp b/src/system/kernel/device_manager/device_manager.cpp index d3a6bfeebd..768bebcf7f 100644 --- a/src/system/kernel/device_manager/device_manager.cpp +++ b/src/system/kernel/device_manager/device_manager.cpp @@ -194,8 +194,6 @@ static device_node *sRootNode; static recursive_lock sLock; static const char* sGenericContextPath; -static uint32 sDriverUpdateCycle = 1; - // #pragma mark - diff --git a/src/system/kernel/device_manager/legacy_drivers.cpp b/src/system/kernel/device_manager/legacy_drivers.cpp index 80e75248b5..c548a6b8ad 100644 --- a/src/system/kernel/device_manager/legacy_drivers.cpp +++ b/src/system/kernel/device_manager/legacy_drivers.cpp @@ -178,7 +178,6 @@ static status_t unload_driver(legacy_driver *driver); static status_t load_driver(legacy_driver *driver); -static int32 sDefaultApiVersion = 1; static hash_table* sDriverHash; static DriverWatcher sDriverWatcher; static int32 sDriverEvents; @@ -334,8 +333,6 @@ load_driver(legacy_driver *driver) { status_t (*init_hardware)(void); status_t (*init_driver)(void); - const char **devicePaths; - int32 exported = 0; status_t status; driver->binary_updated = false; @@ -417,10 +414,6 @@ load_driver(legacy_driver *driver) driver->image = image; return republish_driver(driver); -error3: - if (driver->uninit_driver) - driver->uninit_driver(); - error2: if (driver->uninit_hardware) driver->uninit_hardware(); @@ -679,10 +672,8 @@ reload_driver(legacy_driver *driver) static void -handle_driver_events(void *_fs, int /*iteration*/) +handle_driver_events(void */*_fs*/, int /*iteration*/) { - struct devfs *fs = (devfs *)_fs; - if (atomic_and(&sDriverEvents, 0) == 0) return; diff --git a/src/system/kernel/disk_device_manager/Jamfile b/src/system/kernel/disk_device_manager/Jamfile index b3c08327de..b672a8ba24 100644 --- a/src/system/kernel/disk_device_manager/Jamfile +++ b/src/system/kernel/disk_device_manager/Jamfile @@ -33,7 +33,7 @@ KernelMergeObject kernel_disk_device_manager.o : # disk device types DiskDeviceTypes.cpp - : $(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused + : $(TARGET_KERNEL_PIC_CCFLAGS) ; # KFileDiskDevice.cpp needs the virtualdrive.h Header. Add it here to not diff --git a/src/system/kernel/fs/Jamfile b/src/system/kernel/fs/Jamfile index 138aad6dbf..f704d6a633 100644 --- a/src/system/kernel/fs/Jamfile +++ b/src/system/kernel/fs/Jamfile @@ -17,5 +17,5 @@ KernelMergeObject kernel_fs.o : vfs_boot.cpp vfs_net_boot.cpp - : $(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused + : $(TARGET_KERNEL_PIC_CCFLAGS) ; diff --git a/src/system/kernel/fs/fd.cpp b/src/system/kernel/fs/fd.cpp index b2078231d5..1c28cf76a6 100644 --- a/src/system/kernel/fs/fd.cpp +++ b/src/system/kernel/fs/fd.cpp @@ -856,8 +856,6 @@ _user_seek(int fd, off_t pos, int seekType) status_t _user_ioctl(int fd, ulong op, void *buffer, size_t length) { - struct file_descriptor *descriptor; - if (!IS_USER_ADDRESS(buffer)) return B_BAD_ADDRESS; diff --git a/src/system/kernel/fs/socket.cpp b/src/system/kernel/fs/socket.cpp index b2e812e5b8..3435676cc6 100644 --- a/src/system/kernel/fs/socket.cpp +++ b/src/system/kernel/fs/socket.cpp @@ -946,7 +946,7 @@ _user_recvmsg(int socket, struct msghdr *userMessage, int flags) if (message.msg_controllen < 0) return B_BAD_VALUE; if (message.msg_controllen > MAX_ANCILLARY_DATA_LEN) - message.msg_controllen > MAX_ANCILLARY_DATA_LEN; + message.msg_controllen = MAX_ANCILLARY_DATA_LEN; message.msg_control = ancillary = malloc(message.msg_controllen); if (message.msg_control == NULL) diff --git a/src/system/kernel/fs/vfs.cpp b/src/system/kernel/fs/vfs.cpp index 3949245bd3..588286285f 100644 --- a/src/system/kernel/fs/vfs.cpp +++ b/src/system/kernel/fs/vfs.cpp @@ -169,8 +169,6 @@ struct advisory_locking { } }; -static mutex sFileSystemsMutex = MUTEX_INITIALIZER("vfs_lock"); - /*! \brief Guards sMountsTable. The holder is allowed to read/write access the sMountsTable. @@ -539,7 +537,6 @@ static status_t get_mount(dev_t id, struct fs_mount **_mount) { struct fs_mount *mount; - status_t status; MutexLocker nodeLocker(sVnodeMutex); MutexLocker mountLocker(sMountMutex); @@ -1042,8 +1039,6 @@ vnode_low_memory_handler(void */*data*/, int32 level) // Write back the modified pages of some unused vnodes and free them - uint32 freeCount = count; - for (uint32 i = 0; i < count; i++) { mutex_lock(&sVnodeMutex); struct vnode *vnode = (struct vnode *)list_remove_head_item( @@ -1846,7 +1841,6 @@ vnode_path_to_vnode(struct vnode *vnode, char *path, bool traverseLeafLink, while (true) { struct vnode *nextVnode; - ino_t vnodeID; char *nextPath; TRACE(("vnode_path_to_vnode: top of loop. p = %p, p = '%s'\n", path, path)); @@ -4215,8 +4209,6 @@ vfs_free_io_context(void *_ioContext) static status_t vfs_resize_fd_table(struct io_context *context, const int newSize) { - struct file_descriptor **fds; - if (newSize <= 0 || newSize > MAX_FD_TABLE_SIZE) return EINVAL; @@ -4278,7 +4270,6 @@ vfs_resize_fd_table(struct io_context *context, const int newSize) static status_t vfs_resize_monitor_table(struct io_context *context, const int newSize) { - void *fds; int status = B_OK; if (newSize <= 0 || newSize > MAX_NODE_MONITORS) @@ -7208,8 +7199,6 @@ _kern_remove_dir(int fd, const char *path) status_t _kern_read_link(int fd, const char *path, char *buffer, size_t *_bufferSize) { - status_t status; - if (path) { KPath pathBuffer(path, false, B_PATH_NAME_LENGTH + 1); if (pathBuffer.InitCheck() != B_OK) @@ -7837,7 +7826,6 @@ _user_normalize_path(const char* userPath, bool traverseLink, char* buffer) } // read link - struct stat st; if (HAS_FS_CALL(fileVnode, read_symlink)) { size_t bufferSize = B_PATH_NAME_LENGTH - 1; error = FS_CALL(fileVnode, read_symlink, path, &bufferSize); diff --git a/src/system/kernel/fs/vfs_net_boot.cpp b/src/system/kernel/fs/vfs_net_boot.cpp index f4b3aa532a..e39b4cf66a 100644 --- a/src/system/kernel/fs/vfs_net_boot.cpp +++ b/src/system/kernel/fs/vfs_net_boot.cpp @@ -121,8 +121,6 @@ private: return; } - status_t error = B_OK; - while (dirent* entry = readdir(dir)) { // skip "." and ".." if (strcmp(entry->d_name, ".") == 0 diff --git a/src/system/kernel/messaging/Jamfile b/src/system/kernel/messaging/Jamfile index b989fc9653..644ffa230f 100644 --- a/src/system/kernel/messaging/Jamfile +++ b/src/system/kernel/messaging/Jamfile @@ -12,5 +12,5 @@ KernelMergeObject kernel_messaging.o : KMessage.cpp MessagingService.cpp - : $(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused + : $(TARGET_KERNEL_PIC_CCFLAGS) ; diff --git a/src/system/kernel/messaging/MessagingService.cpp b/src/system/kernel/messaging/MessagingService.cpp index 5cdb049e5a..f2f2f923c0 100644 --- a/src/system/kernel/messaging/MessagingService.cpp +++ b/src/system/kernel/messaging/MessagingService.cpp @@ -377,7 +377,7 @@ MessagingService::UnregisterService() // unset the other members fLockSem = -1; - fCounterSem -1; + fCounterSem = -1; fServerTeam = -1; return B_OK; diff --git a/src/system/kernel/posix/Jamfile b/src/system/kernel/posix/Jamfile index c649048a74..9f99debd87 100644 --- a/src/system/kernel/posix/Jamfile +++ b/src/system/kernel/posix/Jamfile @@ -5,5 +5,5 @@ UsePrivateHeaders shared ; KernelMergeObject kernel_posix.o : realtime_sem.cpp - : $(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused + : $(TARGET_KERNEL_PIC_CCFLAGS) ; diff --git a/src/system/kernel/slab/Jamfile b/src/system/kernel/slab/Jamfile index 3259668bb2..23b9cfaa83 100644 --- a/src/system/kernel/slab/Jamfile +++ b/src/system/kernel/slab/Jamfile @@ -6,5 +6,5 @@ KernelMergeObject kernel_slab.o : allocator.cpp Slab.cpp - : $(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused + : $(TARGET_KERNEL_PIC_CCFLAGS) ; diff --git a/src/system/kernel/util/Jamfile b/src/system/kernel/util/Jamfile index b906307220..add563160a 100644 --- a/src/system/kernel/util/Jamfile +++ b/src/system/kernel/util/Jamfile @@ -11,5 +11,5 @@ KernelMergeObject kernel_util.o : queue.c ring_buffer.cpp - : $(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused -DUSING_LIBGCC + : $(TARGET_KERNEL_PIC_CCFLAGS) -DUSING_LIBGCC ; diff --git a/src/system/kernel/vm/Jamfile b/src/system/kernel/vm/Jamfile index 841b87f8a1..cf5dcb91a8 100644 --- a/src/system/kernel/vm/Jamfile +++ b/src/system/kernel/vm/Jamfile @@ -14,5 +14,5 @@ KernelMergeObject kernel_vm.o : vm_store_null.c #vm_tests.c - : $(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused + : $(TARGET_KERNEL_PIC_CCFLAGS) ;