aboutsummaryrefslogtreecommitdiffstats
path: root/editcap.c
diff options
context:
space:
mode:
Diffstat (limited to 'editcap.c')
-rw-r--r--editcap.c39
1 files changed, 2 insertions, 37 deletions
diff --git a/editcap.c b/editcap.c
index bf2270fb4f..4927e4ecaf 100644
--- a/editcap.c
+++ b/editcap.c
@@ -54,10 +54,6 @@
#include <getopt.h>
#endif
-#ifdef HAVE_LIBZ
-#include <zlib.h> /* to get the libz version number */
-#endif
-
#include <wiretap/wtap.h>
#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"