diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-04-01 01:16:15 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-04-03 02:58:04 +0000 |
| commit | f95976eefcbeb5d24df383c29d29ef888b503945 (patch) | |
| tree | b71c6248cec82341a86e7627ce96fde688d02e05 /dumpcap.c | |
| parent | a14e7a7ce19ea2cd0799ebca43d9eaf00aabb27d (diff) | |
| download | wireshark-f95976eefcbeb5d24df383c29d29ef888b503945.tar.gz | |
Move zlib version check to wsutil
Change-Id: I0950f61e90af5bb21c0017204de0c0b509616e5c
Reviewed-on: https://code.wireshark.org/review/14747
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'dumpcap.c')
| -rw-r--r-- | dumpcap.c | 22 |
1 files changed, 0 insertions, 22 deletions
@@ -54,10 +54,6 @@ #include <signal.h> #include <errno.h> -#ifdef HAVE_LIBZ -#include <zlib.h> /* to get the libz version number */ -#endif - #include <wsutil/cmdarg_err.h> #include <wsutil/crash_info.h> #include <wsutil/ws_diag_control.h> @@ -3706,19 +3702,6 @@ get_dumpcap_compiled_info(GString *str) /* Capture libraries */ g_string_append(str, ", "); get_compiled_caplibs_version(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 @@ -3727,11 +3710,6 @@ get_dumpcap_runtime_info(GString *str) /* Capture libraries */ g_string_append(str, ", "); get_runtime_caplibs_version(str); - - /* zlib */ -#if defined(HAVE_LIBZ) && !defined(_WIN32) - g_string_append_printf(str, ", with libz %s", zlibVersion()); -#endif } /* And now our feature presentation... [ fade to music ] */ |