From bc374ef5db711759b75abcbf3e33abec8ad6001f Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 17 Jul 2018 10:14:20 +0200 Subject: [PATCH] Replace uint with uint32_t --- bacula/src/dird/ua_dotcmds.c | 4 +--- bacula/src/lib/message.c | 4 +--- bacula/src/lib/message.h | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/bacula/src/dird/ua_dotcmds.c b/bacula/src/dird/ua_dotcmds.c index b4f087e1d..ff7cfdf0b 100644 --- a/bacula/src/dird/ua_dotcmds.c +++ b/bacula/src/dird/ua_dotcmds.c @@ -1872,12 +1872,10 @@ static bool typescmd(UAContext *ua, const char *cmd) static bool tagscmd(UAContext *ua, const char *cmd) { -#ifdef xxx - uint i = 0; + uint32_t i = 0; for (const char *p = debug_get_tag(i++, NULL) ; p ; p = debug_get_tag(i++, NULL)) { ua->send_msg("%s\n", p); } -#endif return true; } diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c index b3c4a0e50..3b7315177 100644 --- a/bacula/src/lib/message.c +++ b/bacula/src/lib/message.c @@ -1847,8 +1847,7 @@ static struct debugtags debug_tags[] = { #define MAX_TAG (sizeof(debug_tags) / sizeof(struct debugtags)) -#ifdef xxx /* Hey what is unit??? it is not defined on all platforms */ -const char *debug_get_tag(uint pos, const char **desc) +const char *debug_get_tag(uint32_t pos, const char **desc) { if (pos < MAX_TAG) { if (desc) { @@ -1858,7 +1857,6 @@ const char *debug_get_tag(uint pos, const char **desc) } return NULL; } -#endif /* Allow +-, */ bool debug_find_tag(const char *tagname, bool add, int64_t *current_level) diff --git a/bacula/src/lib/message.h b/bacula/src/lib/message.h index 2e84fb45c..b76f36e1d 100644 --- a/bacula/src/lib/message.h +++ b/bacula/src/lib/message.h @@ -165,7 +165,7 @@ struct MQUEUE_ITEM { #define DT_ASX (1<<16) /* used by Alain for personal debugging */ #define DT_ALL (0x7FFF0000) /* all (up to debug_level 65635, 15 flags available) */ -//const char *debug_get_tag(uint pos, const char **desc); +const char *debug_get_tag(uint32_t pos, const char **desc); bool debug_find_tag(const char *tagname, bool add, int64_t *current_level); bool debug_parse_tags(const char *options, int64_t *current_level); -- 2.47.3