diff options
| author | Gerald Combs <gerald@wireshark.org> | 2023-09-22 13:42:49 -0700 |
|---|---|---|
| committer | AndersBroman <a.broman58@gmail.com> | 2023-09-24 19:05:10 +0000 |
| commit | 8285a9775ff6b5a7ef853dadffa1363b380b0399 (patch) | |
| tree | ef77e8b2059712538f1b84480896cb684a36a319 /wsutil/cpu_info.c | |
| parent | c8a725e54e0f426879c238401cae82b4dfc6918e (diff) | |
Convert wsutil to C99 types
Ping #19116
Diffstat (limited to 'wsutil/cpu_info.c')
| -rw-r--r-- | wsutil/cpu_info.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/wsutil/cpu_info.c b/wsutil/cpu_info.c index a0c712d301..f9e6aa2521 100644 --- a/wsutil/cpu_info.c +++ b/wsutil/cpu_info.c @@ -35,8 +35,8 @@ * Functions used for the GTree we use to keep a list of *unique* * model strings. */ -static gint -compare_model_names(gconstpointer a, gconstpointer b, gpointer user_data _U_) +static int +compare_model_names(gconstpointer a, gconstpointer b, void * user_data _U_) { return strcmp((const char *)a, (const char *)b); } @@ -47,8 +47,8 @@ struct string_info { }; static gboolean -add_model_name_to_string(gpointer key, gpointer value _U_, - gpointer data) +add_model_name_to_string(void * key, void * value _U_, + void * data) { struct string_info *info = (struct string_info *)data; @@ -66,7 +66,7 @@ add_model_name_to_string(gpointer key, gpointer value _U_, info->sep = ", "; /* Keep going. */ - return FALSE; + return false; } /* @@ -381,7 +381,7 @@ get_cpu_info(GString *str) * use ws_cpuid(), which uses CPUID on x86 and doesn't get any * information for other instruction sets. */ - guint32 CPUInfo[4]; + uint32_t CPUInfo[4]; char CPUBrandString[0x40]; unsigned nExIds; @@ -416,7 +416,7 @@ get_cpu_info(GString *str) g_tree_insert(model_names, model_name, NULL); #endif - gint num_model_names = g_tree_nnodes(model_names); + int num_model_names = g_tree_nnodes(model_names); if (num_model_names > 0) { /* |