Update some links.

[obnox/wireshark/wip.git] / tshark.c

diff --git a/tshark.c b/tshark.c
index a6b7ffc6c46a301bed3e9dfcef13e8ef4fe50370..5c63d2c7ef99c418ef78f87b4b2d11f6a336ab00 100644 (file)
--- a/tshark.c
+++ b/tshark.c
@@ -280,6 +280,8 @@ print_usage(gboolean print_ver)
   fprintf(output, "  -E<fieldsoption>=<value> set options for output when -Tfields selected:\n");
   fprintf(output, "     header=y|n            switch headers on and off\n");
   fprintf(output, "     separator=/t|/s|<char> select tab, space, printable character as separator\n");
+  fprintf(output, "     occurrence=f|l|a      print first, last or all occurrences of each field\n");
+  fprintf(output, "     aggregator=,|/s|<char> select comma, space, printable character as aggregator\n");
   fprintf(output, "     quote=d|s|n           select double, single, no quotes for values\n");
   fprintf(output, "  -t ad|a|r|d|dd|e         output format of time stamps (def: r: rel. to first)\n");
   fprintf(output, "  -u s|hms                 output format of seconds (def: s: seconds)\n");
@@ -1255,7 +1257,7 @@ main(int argc, char *argv[])
         GString             *runtime_info_str;
         /* Assemble the compile-time version information string */
         comp_info_str = g_string_new("Compiled ");
-        get_compiled_version_info(comp_info_str, get_epan_compiled_version_info);
+        get_compiled_version_info(comp_info_str, epan_get_compiled_version_info);
 
         /* Assemble the run-time version information string */
         runtime_info_str = g_string_new("Running ");
@@ -2157,8 +2159,8 @@ capture_input_new_packets(capture_options *capture_opts, int to_read)
   tap_flags = union_of_tap_listener_flags();
 
   if(do_dissection) {
-    wtap_cleareof(cf->wth);
     while (to_read-- && cf->wth) {
+      wtap_cleareof(cf->wth);
       ret = wtap_read(cf->wth, &err, &err_info, &data_offset);
       if(ret == FALSE) {
         /* read from file failed, tell the capture child to stop */