From f95976eefcbeb5d24df383c29d29ef888b503945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Fri, 1 Apr 2016 01:16:15 +0100 Subject: Move zlib version check to wsutil MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0950f61e90af5bb21c0017204de0c0b509616e5c Reviewed-on: https://code.wireshark.org/review/14747 Petri-Dish: João Valverde Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- editcap.c | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) (limited to 'editcap.c') diff --git a/editcap.c b/editcap.c index bf2270fb4f..4927e4ecaf 100644 --- a/editcap.c +++ b/editcap.c @@ -54,10 +54,6 @@ #include #endif -#ifdef HAVE_LIBZ -#include /* to get the libz version number */ -#endif - #include #include "epan/etypes.h" @@ -908,37 +904,6 @@ failure_message(const char *msg_format _U_, va_list ap _U_) } #endif -static void -get_editcap_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_editcap_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 wtap_dumper * editcap_dump_open(const char *filename, guint32 snaplen, wtap_optionblock_t shb_hdr, @@ -1017,10 +982,10 @@ main(int argc, char *argv[]) #endif /* _WIN32 */ /* Get the compile-time version information string */ - comp_info_str = get_compiled_version_info(NULL, get_editcap_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_editcap_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("Editcap (Wireshark) %s\n" -- cgit v1.2.3