diff options
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 40 |
1 files changed, 2 insertions, 38 deletions
diff --git a/mergecap.c b/mergecap.c index f6fad775e3..3e93ea592a 100644 --- a/mergecap.c +++ b/mergecap.c @@ -34,10 +34,6 @@ #include <getopt.h> #endif -#ifdef HAVE_LIBZ -#include <zlib.h> /* to get the libz version number */ -#endif - #include <string.h> #include <wiretap/wtap.h> @@ -177,38 +173,6 @@ list_idb_merge_modes(void) { } } -static void -get_mergecap_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_mergecap_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 -} - - static gboolean merge_callback(merge_event event, int num, const merge_in_file_t in_files[], const guint in_file_count, @@ -317,10 +281,10 @@ main(int argc, char *argv[]) #endif /* _WIN32 */ /* Get the compile-time version information string */ - comp_info_str = get_compiled_version_info(NULL, get_mergecap_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_mergecap_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("Mergecap (Wireshark) %s\n" |