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 /captype.c | |
| parent | a14e7a7ce19ea2cd0799ebca43d9eaf00aabb27d (diff) | |
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 'captype.c')
| -rw-r--r-- | captype.c | 39 |
1 files changed, 2 insertions, 37 deletions
@@ -36,10 +36,6 @@ #include <getopt.h> #endif -#ifdef HAVE_LIBZ -#include <zlib.h> /* to get the libz version number */ -#endif - #include <glib.h> #include <wiretap/wtap.h> @@ -86,37 +82,6 @@ failure_message(const char *msg_format _U_, va_list ap _U_) } #endif -static void -get_captype_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_captype_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[]) { @@ -142,10 +107,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_captype_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_captype_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("Captype (Wireshark) %s\n" |