aboutsummaryrefslogtreecommitdiffstats
path: root/tfshark.c
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2016-04-01 01:16:15 +0100
committerMichael Mann <mmann78@netscape.net>2016-04-03 02:58:04 +0000
commitf95976eefcbeb5d24df383c29d29ef888b503945 (patch)
treeb71c6248cec82341a86e7627ce96fde688d02e05 /tfshark.c
parenta14e7a7ce19ea2cd0799ebca43d9eaf00aabb27d (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 'tfshark.c')
-rw-r--r--tfshark.c28
1 files changed, 1 insertions, 27 deletions
diff --git a/tfshark.c b/tfshark.c
index fea110c..595917c 100644
--- a/tfshark.c
+++ b/tfshark.c
@@ -35,10 +35,6 @@
#include <errno.h>
-#ifdef HAVE_LIBZ
-#include <zlib.h> /* to get the libz version number */
-#endif
-
#ifndef HAVE_GETOPT_LONG
#include "wsutil/wsgetopt.h"
#endif
@@ -727,29 +723,8 @@ print_current_user(void) {
}
static void
-get_tfshark_compiled_version_info(GString *str)
-{
- /* LIBZ */
-#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_tfshark_runtime_version_info(GString *str)
{
- /* zlib */
-#if defined(HAVE_LIBZ) && !defined(_WIN32)
- g_string_append_printf(str, ", with libz %s", zlibVersion());
-#endif
-
/* stuff used by libwireshark */
epan_get_runtime_version_info(str);
}
@@ -844,8 +819,7 @@ main(int argc, char *argv[])
initialize_funnel_ops();
/* Get the compile-time version information string */
- comp_info_str = get_compiled_version_info(get_tfshark_compiled_version_info,
- epan_get_compiled_version_info);
+ comp_info_str = get_compiled_version_info(NULL, epan_get_compiled_version_info);
/* Get the run-time version information string */
runtime_info_str = get_runtime_version_info(get_tfshark_runtime_version_info);