diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-12-31 13:43:01 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-12-31 21:43:29 +0000 |
| commit | 23b1127daf17ce2eaa46fba208970b2228abd3d8 (patch) | |
| tree | 174dc9db5521b185e61e9549b075b716f5f30d7d /wsutil/ws_version_info.c | |
| parent | 93efc201159cb045325956f97570d65fe42fca8d (diff) | |
| download | wireshark-23b1127daf17ce2eaa46fba208970b2228abd3d8.tar.gz | |
Swallow get_glib_version_info() into get_compiled_version_info().
It's not that complicated, so we might as well just do it in line.
Change-Id: I10809db554e668a853d28e7dca48b2de0ed51ad3
Reviewed-on: https://code.wireshark.org/review/6190
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wsutil/ws_version_info.c')
| -rw-r--r-- | wsutil/ws_version_info.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/wsutil/ws_version_info.c b/wsutil/ws_version_info.c index c4f0173810..baa0a9a3f2 100644 --- a/wsutil/ws_version_info.c +++ b/wsutil/ws_version_info.c @@ -69,23 +69,6 @@ end_string(GString *str) } /* - * Get the GLib version, and append it to the GString - */ -void -get_glib_version_info(GString *str) -{ - /* GLIB */ - g_string_append(str, "with "); - g_string_append_printf(str, -#ifdef GLIB_MAJOR_VERSION - "GLib %d.%d.%d", GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, - GLIB_MICRO_VERSION); -#else - "GLib (version unknown)"); -#endif -} - -/* * Get various library compile-time versions, put them in a GString, * and return the GString. * @@ -116,7 +99,15 @@ get_compiled_version_info(void (*prepend_info)(GString *), g_string_append(str, ", "); } - get_glib_version_info(str); + /* GLIB */ + g_string_append(str, "with "); + g_string_append_printf(str, +#ifdef GLIB_MAJOR_VERSION + "GLib %d.%d.%d", GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, + GLIB_MICRO_VERSION); +#else + "GLib (version unknown)"); +#endif /* Additional application-dependent information */ if (append_info) |