From 1e6dd3feed715e3344f19c80898e54b33f11d736 Mon Sep 17 00:00:00 2001 From: Murai Takashi Date: Sat, 25 Apr 2015 08:08:00 +0900 Subject: [PATCH] Fix GCC 5 maybe-uninitialized warnings. Signed-off-by: Adrien Destugues Fixes #12020 --- .../accelerants/radeon_hd/atombios/atom.cpp | 22 +++++++++---------- .../kernel/file_systems/bfs/BPlusTree.cpp | 6 ++--- .../x86_physical_page_mapper_large_memory.cpp | 2 +- .../kernel/device_manager/device_manager.cpp | 2 +- src/system/kernel/fs/vfs.cpp | 2 +- .../kernel/messaging/MessagingService.cpp | 2 +- src/system/libroot/os/driver_settings.cpp | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/add-ons/accelerants/radeon_hd/atombios/atom.cpp b/src/add-ons/accelerants/radeon_hd/atombios/atom.cpp index 6c61e53c45..2afcd26a88 100644 --- a/src/add-ons/accelerants/radeon_hd/atombios/atom.cpp +++ b/src/add-ons/accelerants/radeon_hd/atombios/atom.cpp @@ -496,7 +496,7 @@ static void atom_op_add(atom_exec_context *ctx, int *ptr, int arg) { uint8 attr = U8((*ptr)++); - uint32 dst, src, saved; + uint32 dst, src, saved = 0; int dptr = *ptr; dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1); src = atom_get_src(ctx, attr, ptr); @@ -513,7 +513,7 @@ static void atom_op_and(atom_exec_context *ctx, int *ptr, int arg) { uint8 attr = U8((*ptr)++); - uint32 dst, src, saved; + uint32 dst, src, saved = 0; int dptr = *ptr; dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1); src = atom_get_src(ctx, attr, ptr); @@ -559,7 +559,7 @@ static void atom_op_clear(atom_exec_context *ctx, int *ptr, int arg) { uint8 attr = U8((*ptr)++); - uint32 saved; + uint32 saved = 0; int dptr = *ptr; attr &= 0x38; attr |= atom_def_dst[attr>>3]<<6; @@ -684,7 +684,7 @@ static void atom_op_mask(atom_exec_context *ctx, int *ptr, int arg) { uint8 attr = U8((*ptr)++); - uint32 dst, mask, src, saved; + uint32 dst, mask, src, saved = 0; int dptr = *ptr; dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1); mask = atom_get_src_direct(ctx, ((attr >> 3) & 7), ptr); @@ -740,7 +740,7 @@ static void atom_op_or(atom_exec_context *ctx, int *ptr, int arg) { uint8 attr = U8((*ptr)++); - uint32 dst, src, saved; + uint32 dst, src, saved = 0; int dptr = *ptr; dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1); src = atom_get_src(ctx, attr, ptr); @@ -848,7 +848,7 @@ atom_op_setregblock(atom_exec_context *ctx, int *ptr, int arg) static void atom_op_shift_left(atom_exec_context *ctx, int *ptr, int arg) { uint8 attr = U8((*ptr)++), shift; - uint32 saved, dst; + uint32 saved = 0, dst; int dptr = *ptr; attr &= 0x38; attr |= atom_def_dst[attr >> 3] << 6; @@ -866,7 +866,7 @@ static void atom_op_shift_left(atom_exec_context *ctx, int *ptr, int arg) static void atom_op_shift_right(atom_exec_context *ctx, int *ptr, int arg) { uint8 attr = U8((*ptr)++), shift; - uint32 saved, dst; + uint32 saved = 0, dst; int dptr = *ptr; attr &= 0x38; attr |= atom_def_dst[attr >> 3] << 6; @@ -884,7 +884,7 @@ static void atom_op_shift_right(atom_exec_context *ctx, int *ptr, int arg) static void atom_op_shl(atom_exec_context *ctx, int *ptr, int arg) { uint8 attr = U8((*ptr)++), shift; - uint32 saved, dst; + uint32 saved = 0, dst; int dptr = *ptr; uint32 dst_align = atom_dst_to_src[(attr >> 3) & 7][(attr >> 6) & 3]; dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1); @@ -905,7 +905,7 @@ static void atom_op_shl(atom_exec_context *ctx, int *ptr, int arg) static void atom_op_shr(atom_exec_context *ctx, int *ptr, int arg) { uint8 attr = U8((*ptr)++), shift; - uint32 saved, dst; + uint32 saved = 0, dst; int dptr = *ptr; uint32 dst_align = atom_dst_to_src[(attr >> 3) & 7][(attr >> 6) & 3]; dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1); @@ -927,7 +927,7 @@ static void atom_op_sub(atom_exec_context *ctx, int *ptr, int arg) { uint8 attr = U8((*ptr)++); - uint32 dst, src, saved; + uint32 dst, src, saved = 0; int dptr = *ptr; dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1); src = atom_get_src(ctx, attr, ptr); @@ -984,7 +984,7 @@ static void atom_op_xor(atom_exec_context *ctx, int *ptr, int arg) { uint8 attr = U8((*ptr)++); - uint32 dst, src, saved; + uint32 dst, src, saved = 0; int dptr = *ptr; dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1); src = atom_get_src(ctx, attr, ptr); diff --git a/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp b/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp index 9a6cf4e6cf..330ed6e6bd 100644 --- a/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp +++ b/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp @@ -1062,7 +1062,7 @@ BPlusTree::_FindKey(const bplustree_node* node, const uint8* key, for (int16 first = 0, last = node->NumKeys() - 1; first <= last;) { uint16 i = (first + last) >> 1; - uint16 searchLength; + uint16 searchLength = 0; uint8* searchKey = node->KeyAt(i, &searchLength); if (searchKey + searchLength + sizeof(off_t) + sizeof(uint16) > (uint8*)node + fNodeSize @@ -2732,7 +2732,7 @@ TreeIterator::Traverse(int8 direction, void* key, uint16* keyLength, if (node->all_key_count == 0) RETURN_ERROR(B_ERROR); // B_ENTRY_NOT_FOUND ? - uint16 length; + uint16 length = 0; uint8* keyStart = node->KeyAt(fCurrentKey, &length); if (keyStart + length + sizeof(off_t) + sizeof(uint16) > (uint8*)node + fTree->fNodeSize @@ -2991,7 +2991,7 @@ bplustree_node::CheckIntegrity(uint32 nodeSize) const DEBUGGER(("invalid node: key/length count")); for (int32 i = 0; i < NumKeys(); i++) { - uint16 length; + uint16 length = 0; uint8* key = KeyAt(i, &length); if (key + length + sizeof(off_t) + sizeof(uint16) > (uint8*)this + nodeSize diff --git a/src/system/kernel/arch/x86/paging/x86_physical_page_mapper_large_memory.cpp b/src/system/kernel/arch/x86/paging/x86_physical_page_mapper_large_memory.cpp index 07c9446fdc..e816af1ea8 100644 --- a/src/system/kernel/arch/x86/paging/x86_physical_page_mapper_large_memory.cpp +++ b/src/system/kernel/arch/x86/paging/x86_physical_page_mapper_large_memory.cpp @@ -492,7 +492,7 @@ status_t LargeMemoryPhysicalPageMapper::GetPage(phys_addr_t physicalAddress, addr_t* virtualAddress, void** handle) { - PhysicalPageSlot* slot; + PhysicalPageSlot* slot = NULL; status_t error = GetSlot(true, slot); if (error != B_OK) return error; diff --git a/src/system/kernel/device_manager/device_manager.cpp b/src/system/kernel/device_manager/device_manager.cpp index 5537aa0d8d..f42a03094d 100644 --- a/src/system/kernel/device_manager/device_manager.cpp +++ b/src/system/kernel/device_manager/device_manager.cpp @@ -2209,7 +2209,7 @@ init_node_tree(void) {NULL} }; - device_node* node; + device_node* node = NULL; if (register_node(NULL, DEVICE_MANAGER_ROOT_NAME, attrs, NULL, &node) != B_OK) { dprintf("Cannot register Devices Root Node\n"); diff --git a/src/system/kernel/fs/vfs.cpp b/src/system/kernel/fs/vfs.cpp index 2d133b8e36..6645658015 100644 --- a/src/system/kernel/fs/vfs.cpp +++ b/src/system/kernel/fs/vfs.cpp @@ -4121,7 +4121,7 @@ vfs_get_vnode_from_path(const char* path, bool kernel, struct vnode** _vnode) extern "C" status_t vfs_get_vnode(dev_t mountID, ino_t vnodeID, bool canWait, struct vnode** _vnode) { - struct vnode* vnode; + struct vnode* vnode = NULL; status_t status = get_vnode(mountID, vnodeID, &vnode, canWait, false); if (status != B_OK) diff --git a/src/system/kernel/messaging/MessagingService.cpp b/src/system/kernel/messaging/MessagingService.cpp index 728a31eb5b..4b59f25eec 100644 --- a/src/system/kernel/messaging/MessagingService.cpp +++ b/src/system/kernel/messaging/MessagingService.cpp @@ -568,7 +568,7 @@ _user_register_messaging_service(sem_id lockSem, sem_id counterSem) if (!sMessagingService->Lock()) return B_BAD_VALUE; - area_id areaID; + area_id areaID = 0; status_t error = sMessagingService->RegisterService(lockSem, counterSem, areaID); diff --git a/src/system/libroot/os/driver_settings.cpp b/src/system/libroot/os/driver_settings.cpp index 17a6473dfb..9004095dac 100644 --- a/src/system/libroot/os/driver_settings.cpp +++ b/src/system/libroot/os/driver_settings.cpp @@ -282,7 +282,7 @@ parse_parameter(struct driver_parameter *parameter, char **_pos, int32 level) status = get_word(&pos, ¶meter->name, NO_ASSIGNMENT, true); if (status == CONTINUE_PARAMETER) { while (status == CONTINUE_PARAMETER) { - char **newArray, *value; + char **newArray, *value = NULL; status = get_word(&pos, &value, parameter->value_count == 0 ? ALLOW_ASSIGNMENT : IGNORE_ASSIGNMENT, false); if (status < B_OK)