Fix build errors for tfshark and echld.

Some come from the recent version information changes, some were broken
before that.

Change-Id: I9429f7d45d3c51c579aef592b37c79130a443299
Reviewed-on: https://code.wireshark.org/review/2531
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 9 insertions, 8 deletions

diff --git a/tfshark.c b/tfshark.c
index 6f3f5984aa..8eb2565d83 100644
--- a/tfshark.c
+++ b/tfshark.c
@@ -65,6 +65,7 @@
 #include <wsutil/filesystem.h>
 #include <wsutil/report_err.h>
 #include <wsutil/copyright_info.h>
+#include <wsutil/ws_version_info.h>
 
 #include "globals.h"
 #include <epan/timestamp.h>
@@ -197,12 +198,12 @@ print_usage(gboolean print_ver)
   if (print_ver) {
     output = stdout;
     fprintf(output,
-        "TFShark " VERSION "%s\n"
+        "TFShark %s\n"
         "Dump and analyze network traffic.\n"
         "See http://www.wireshark.org for more information.\n"
         "\n"
         "%s",
-         wireshark_gitversion, get_copyright_info());
+        get_ws_vcs_version_info(), get_copyright_info());
   } else {
     output = stderr;
   }
@@ -270,7 +271,7 @@ glossary_option_help(void)
 
   output = stdout;
 
-  fprintf(output, "TFShark " VERSION "%s\n", wireshark_gitversion);
+  fprintf(output, "TFShark %s\n", get_ws_vcs_version_info());
 
   fprintf(output, "\n");
   fprintf(output, "Usage: tfshark -G [report]\n");
@@ -745,14 +746,14 @@ print_current_user(void) {
 static void
 show_version(GString *comp_info_str, GString *runtime_info_str)
 {
-  printf("TFShark " VERSION "%s\n"
+  printf("TFShark %s\n"
          "\n"
          "%s"
          "\n"
          "%s"
          "\n"
          "%s",
-         wireshark_gitversion, get_copyright_info(), comp_info_str->str,
+         get_ws_vcs_version_info(), get_copyright_info(), comp_info_str->str,
          runtime_info_str->str);
 }
 
@@ -800,12 +801,12 @@ main(int argc, char *argv[])
   get_runtime_version_info(runtime_info_str, NULL);
 
   /* Add it to the information to be reported on a crash. */
-  ws_add_crash_info("TFShark " VERSION "%s\n"
+  ws_add_crash_info("TFShark %s\n"
          "\n"
          "%s"
          "\n"
          "%s",
-      wireshark_gitversion, comp_info_str->str, runtime_info_str->str);
+      get_ws_vcs_version_info(), comp_info_str->str, runtime_info_str->str);
 
 #ifdef _WIN32
   arg_list_utf_16to8(argc, argv);
@@ -2112,7 +2113,7 @@ write_preamble(capture_file *cf)
   switch (output_action) {
 
   case WRITE_TEXT:
-    return print_preamble(print_stream, cf ? cf->filename : NULL, wireshark_gitversion);
+    return print_preamble(print_stream, cf ? cf->filename : NULL, get_ws_vcs_version_info());
 
   case WRITE_XML:
     if (print_details)