Module: wine Branch: master Commit: 9896f1ce33561771989d3117c1536fb472df8558 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9896f1ce33561771989d3117c...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Apr 6 19:42:12 2020 +0200
dbghelp: Fix GCC warnings in macho_module.c.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/dbghelp/image_private.h | 2 +- dlls/dbghelp/macho_module.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 4171b38923..870f530057 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -130,7 +130,7 @@ struct image_file_map struct image_file_map* dsym; /* the debug symbols file associated with this one */ size_t header_size; /* size of real header in file */ size_t commands_size; - size_t commands_count; + unsigned int commands_count;
const struct macho_load_command* load_commands; const struct macho_uuid_command* uuid; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 8b32a190d8..3ef65af7c9 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -566,7 +566,7 @@ static int macho_enum_load_commands(struct image_file_map *ifm, unsigned cmd,
if ((lc = macho_map_load_commands(fmap)) == IMAGE_NO_MAP) return -1;
- TRACE("%lu total commands\n", fmap->commands_count); + TRACE("%u total commands\n", fmap->commands_count);
for (i = 0; i < fmap->commands_count; i++, lc = macho_next_load_command(lc)) { @@ -1639,7 +1639,7 @@ static BOOL macho_enum_modules_internal(const struct process* pcs, } if (!image_infos.infos64.infoArray) goto done; - TRACE("Process has %u image infos at %p\n", image_infos.infos64.infoArrayCount, (void*)image_infos.infos64.infoArray); + TRACE("Process has %u image infos at %s\n", image_infos.infos64.infoArrayCount, wine_dbgstr_longlong(image_infos.infos64.infoArray));
if (pcs->is_64bit) len = sizeof(info_array->info64); @@ -1751,6 +1751,7 @@ static BOOL macho_enum_modules(struct process* process, enum_modules_cb cb, void
TRACE("(%p, %p, %p)\n", process->handle, cb, user); macho_info.flags = MACHO_INFO_NAME; + macho_info.module_name = NULL; ret = macho_enum_modules_internal(process, macho_info.module_name, cb, user); HeapFree(GetProcessHeap(), 0, (char*)macho_info.module_name); return ret;