diff options
Diffstat (limited to 'capinfos.c')
| -rw-r--r-- | capinfos.c | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/capinfos.c b/capinfos.c index e75e70e1ec..2476a62a18 100644 --- a/capinfos.c +++ b/capinfos.c @@ -69,10 +69,6 @@ #include <glib.h> -#ifdef HAVE_LIBZ -#include <zlib.h> /* to get the libz version number */ -#endif - #include <wiretap/wtap.h> #include <wsutil/crash_info.h> @@ -1366,37 +1362,6 @@ hash_to_str(const unsigned char *hash, size_t length, char *str) { } #endif /* HAVE_LIBGCRYPT */ -static void -get_capinfos_compiled_info(GString *str) -{ - /* LIBZ */ - g_string_append(str, ", "); -#ifdef HAVE_LIBZ - g_string_append(str, "with libz "); -#ifdef ZLIB_VERSION - g_string_append(str, ZLIB_VERSION); -#else /* ZLIB_VERSION */ - g_string_append(str, "(version unknown)"); -#endif /* ZLIB_VERSION */ -#else /* HAVE_LIBZ */ - g_string_append(str, "without libz"); -#endif /* HAVE_LIBZ */ -} - -static void -get_capinfos_runtime_info( -#if defined(HAVE_LIBZ) && !defined(_WIN32) - GString *str) -#else - GString *str _U_) -#endif -{ - /* zlib */ -#if defined(HAVE_LIBZ) && !defined(_WIN32) - g_string_append_printf(str, ", with libz %s", zlibVersion()); -#endif -} - int main(int argc, char *argv[]) { @@ -1428,10 +1393,10 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); /* Get the compile-time version information string */ - comp_info_str = get_compiled_version_info(NULL, get_capinfos_compiled_info); + comp_info_str = get_compiled_version_info(NULL, NULL); /* Get the run-time version information string */ - runtime_info_str = get_runtime_version_info(get_capinfos_runtime_info); + runtime_info_str = get_runtime_version_info(NULL); /* Add it to the information to be reported on a crash. */ ws_add_crash_info("Capinfos (Wireshark) %s\n" |