=?UTF-8?Q?Fr=C3=A9d=C3=A9ric=20Delanoy=20?=: dbghelp: Use BOOL type where appropriate.
Alexandre Julliard
julliard at winehq.org
Tue Nov 12 14:26:35 CST 2013
Module: wine
Branch: master
Commit: 1d65efe50b7ac88a060defb301b4a5c10587b055
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d65efe50b7ac88a060defb301b4a5c10587b055
Author: Frédéric Delanoy <frederic.delanoy at gmail.com>
Date: Tue Nov 12 01:16:36 2013 +0100
dbghelp: Use BOOL type where appropriate.
---
dlls/dbghelp/cpu_arm.c | 4 ++--
dlls/dbghelp/cpu_arm64.c | 4 ++--
dlls/dbghelp/cpu_i386.c | 8 ++++----
dlls/dbghelp/cpu_ppc.c | 4 ++--
dlls/dbghelp/cpu_x86_64.c | 4 ++--
dlls/dbghelp/dbghelp_private.h | 2 +-
dlls/dbghelp/module.c | 2 +-
dlls/dbghelp/msc.c | 18 +++++++++---------
8 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c
index 740db0f..bd2c677 100644
--- a/dlls/dbghelp/cpu_arm.c
+++ b/dlls/dbghelp/cpu_arm.c
@@ -29,8 +29,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
-static unsigned arm_get_addr(HANDLE hThread, const CONTEXT* ctx,
- enum cpu_addr ca, ADDRESS64* addr)
+static BOOL arm_get_addr(HANDLE hThread, const CONTEXT* ctx,
+ enum cpu_addr ca, ADDRESS64* addr)
{
addr->Mode = AddrModeFlat;
addr->Segment = 0; /* don't need segment */
diff --git a/dlls/dbghelp/cpu_arm64.c b/dlls/dbghelp/cpu_arm64.c
index c816fe3..d80e608 100644
--- a/dlls/dbghelp/cpu_arm64.c
+++ b/dlls/dbghelp/cpu_arm64.c
@@ -29,8 +29,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
-static unsigned arm64_get_addr(HANDLE hThread, const CONTEXT* ctx,
- enum cpu_addr ca, ADDRESS64* addr)
+static BOOL arm64_get_addr(HANDLE hThread, const CONTEXT* ctx,
+ enum cpu_addr ca, ADDRESS64* addr)
{
addr->Mode = AddrModeFlat;
addr->Segment = 0; /* don't need segment */
diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c
index c912a0a..87f833f 100644
--- a/dlls/dbghelp/cpu_i386.c
+++ b/dlls/dbghelp/cpu_i386.c
@@ -48,8 +48,8 @@ static ADDRESS_MODE get_selector_type(HANDLE hThread, const CONTEXT* ctx, WORD s
return -1;
}
-static unsigned i386_build_addr(HANDLE hThread, const CONTEXT* ctx, ADDRESS64* addr,
- unsigned seg, unsigned long offset)
+static BOOL i386_build_addr(HANDLE hThread, const CONTEXT* ctx, ADDRESS64* addr,
+ unsigned seg, unsigned long offset)
{
addr->Mode = AddrModeFlat;
addr->Segment = seg;
@@ -73,8 +73,8 @@ static unsigned i386_build_addr(HANDLE hThread, const CONTEXT* ctx, ADDRESS64* a
}
#endif
-static unsigned i386_get_addr(HANDLE hThread, const CONTEXT* ctx,
- enum cpu_addr ca, ADDRESS64* addr)
+static BOOL i386_get_addr(HANDLE hThread, const CONTEXT* ctx,
+ enum cpu_addr ca, ADDRESS64* addr)
{
#ifdef __i386__
switch (ca)
diff --git a/dlls/dbghelp/cpu_ppc.c b/dlls/dbghelp/cpu_ppc.c
index 56571c5..3b2a843 100644
--- a/dlls/dbghelp/cpu_ppc.c
+++ b/dlls/dbghelp/cpu_ppc.c
@@ -28,8 +28,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
-static unsigned ppc_get_addr(HANDLE hThread, const CONTEXT* ctx,
- enum cpu_addr ca, ADDRESS64* addr)
+static BOOL ppc_get_addr(HANDLE hThread, const CONTEXT* ctx,
+ enum cpu_addr ca, ADDRESS64* addr)
{
switch (ca)
{
diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c
index 29f4c6f..e0ffb11 100644
--- a/dlls/dbghelp/cpu_x86_64.c
+++ b/dlls/dbghelp/cpu_x86_64.c
@@ -91,8 +91,8 @@ typedef struct _UNWIND_INFO
#define GetExceptionDataPtr(info) \
((PVOID)((PULONG)GetLanguageSpecificData(info) + 1)
-static unsigned x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx,
- enum cpu_addr ca, ADDRESS64* addr)
+static BOOL x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx,
+ enum cpu_addr ca, ADDRESS64* addr)
{
addr->Mode = AddrModeFlat;
switch (ca)
diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h
index 9390fab..74cba88 100644
--- a/dlls/dbghelp/dbghelp_private.h
+++ b/dlls/dbghelp/dbghelp_private.h
@@ -520,7 +520,7 @@ struct cpu
DWORD frame_regno;
/* address manipulation */
- unsigned (*get_addr)(HANDLE hThread, const CONTEXT* ctx,
+ BOOL (*get_addr)(HANDLE hThread, const CONTEXT* ctx,
enum cpu_addr, ADDRESS64* addr);
/* stack manipulation */
diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c
index 38d4a58..15769e8 100644
--- a/dlls/dbghelp/module.c
+++ b/dlls/dbghelp/module.c
@@ -56,7 +56,7 @@ static int match_ext(const WCHAR* ptr, size_t len)
for (e = ext; *e; e++)
{
l = strlenW(*e);
- if (l >= len) return FALSE;
+ if (l >= len) return 0;
if (strncmpiW(&ptr[len - l], *e, l)) continue;
return l;
}
diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c
index 4978acf..1e195f3 100644
--- a/dlls/dbghelp/msc.c
+++ b/dlls/dbghelp/msc.c
@@ -651,9 +651,9 @@ static struct symt* codeview_add_type_array(struct codeview_type_parse* ctp,
return &symt_new_array(ctp->module, 0, -arr_len, elem, index)->symt;
}
-static int codeview_add_type_enum_field_list(struct module* module,
- struct symt_enum* symt,
- const union codeview_reftype* ref_type)
+static BOOL codeview_add_type_enum_field_list(struct module* module,
+ struct symt_enum* symt,
+ const union codeview_reftype* ref_type)
{
const unsigned char* ptr = ref_type->fieldlist.list;
const unsigned char* last = (const BYTE*)ref_type + ref_type->generic.len + 2;
@@ -1327,12 +1327,12 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp,
default:
FIXME("Unsupported type-id leaf %x\n", type->generic.id);
dump(type, 2 + type->generic.len);
- return FALSE;
+ return NULL;
}
return codeview_add_type(curr_type, symt) ? symt : NULL;
}
-static int codeview_parse_type_table(struct codeview_type_parse* ctp)
+static BOOL codeview_parse_type_table(struct codeview_type_parse* ctp)
{
unsigned int curr_type = FIRST_DEFINABLE_TYPE;
const union codeview_type* type;
@@ -1557,8 +1557,8 @@ static inline void codeview_add_variable(const struct msc_debug_info* msc_dbg,
}
}
-static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root,
- int offset, int size, BOOL do_globals)
+static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root,
+ int offset, int size, BOOL do_globals)
{
struct symt_function* curr_func = NULL;
int i, length;
@@ -2004,8 +2004,8 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root
return TRUE;
}
-static int codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BYTE* root,
- int offset, int size)
+static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BYTE* root,
+ int offset, int size)
{
int i, length;
More information about the wine-cvs
mailing list