AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: Improve prototype of debug_get_num_option and debug_get_flags_option

Browse Source 
Getting debug_get_num_option to return int64_t, as long under 64 bit Linux are 64 bit size,
 so using fixed int64_t for cross platform consistence, as long under win32 is 32 bit size.

Getting DEBUG_GET_ONCE_FLAGS_OPTION to return uint64_t to getting it to be
consistence with debug_get_flags_option.

DEBUG_GET_ONCE_NUM_OPTION is not accessed in codebase, so add unittest for it, it maybe
used in future, remove it is not consistence

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19554>
This commit is contained in:
Yonggang Luo
2022-11-02 14:46:16 +08:00
committed by Marge Bot
parent 2794ad39fd
commit 501a46fd69
3 changed files with 50 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/u_debug.c
+9 -9
View File
@@ -184,10 +184,10 @@ debug_get_bool_option(const char *name, bool dfault)
}
long
debug_get_num_option(const char *name, long dfault)
int64_t
debug_get_num_option(const char *name, int64_t dfault)
{
long result;
int64_t result;
const char *str;
str = os_get_option(name);
@@ -196,7 +196,7 @@ debug_get_num_option(const char *name, long dfault)
} else {
char *endptr;
result = strtol(str, &endptr, 0);
result = strtoll(str, &endptr, 0);
if (str == endptr) {
/* Restore the default value when no digits were found. */
result = dfault;
@@ -204,7 +204,7 @@ debug_get_num_option(const char *name, long dfault)
}
if (debug_get_option_should_print())
debug_printf("%s: %s = %li\n", __func__, name, result);
debug_printf("%s: %s = %"PRId64"\n", __func__, name, result);
return result;
}
@@ -326,7 +326,7 @@ debug_get_flags_option(const char *name,
const char *
debug_dump_enum(const struct debug_named_value *names,
unsigned long value)
uint64_t value)
{
static char rest[64];
@@ -336,13 +336,13 @@ debug_dump_enum(const struct debug_named_value *names,
++names;
}
snprintf(rest, sizeof(rest), "0x%08lx", value);
snprintf(rest, sizeof(rest), "0x%08"PRIx64, value);
return rest;
}
const char *
debug_dump_flags(const struct debug_named_value *names, unsigned long value)
debug_dump_flags(const struct debug_named_value *names, uint64_t value)
{
static char output[4096];
static char rest[256];
@@ -369,7 +369,7 @@ debug_dump_flags(const struct debug_named_value *names, unsigned long value)
else
first = 0;
snprintf(rest, sizeof(rest), "0x%08lx", value);
snprintf(rest, sizeof(rest), "0x%08"PRIx64, value);
strncat(output, rest, sizeof(output) - strlen(output) - 1);
output[sizeof(output) - 1] = '\0';
}