Whitespace cleanup, sort options, add modelines.

svn path=/trunk/; revision=51804

1 files changed, 82 insertions, 75 deletions

diff --git a/mergecap.c b/mergecap.c
index e8cae5d43f..3a84aeb74b 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -1,4 +1,4 @@
-/* Combine two dump files, either by appending or by merging by timestamp
+/* Combine dump files, either by appending or by merging by timestamp
  *
  * $Id$
  *
@@ -71,17 +71,16 @@ get_natural_int(const char *string, const char *name)
   number = strtol(string, &p, 10);
   if (p == string || *p != '\0') {
     fprintf(stderr, "mergecap: The specified %s \"%s\" isn't a decimal number\n",
-	    name, string);
+            name, string);
     exit(1);
   }
   if (number < 0) {
-    fprintf(stderr, "mergecap: The specified %s is a negative number\n",
-	    name);
+    fprintf(stderr, "mergecap: The specified %s is a negative number\n", name);
     exit(1);
   }
   if (number > INT_MAX) {
     fprintf(stderr, "mergecap: The specified %s is too large (greater than %d)\n",
-	    name, INT_MAX);
+            name, INT_MAX);
     exit(1);
   }
   return (int)number;
@@ -95,8 +94,7 @@ get_positive_int(const char *string, const char *name)
   number = get_natural_int(string, name);
 
   if (number == 0) {
-    fprintf(stderr, "mergecap: The specified %s is zero\n",
-	    name);
+    fprintf(stderr, "mergecap: The specified %s is zero\n", name);
     exit(1);
   }
 
@@ -109,12 +107,11 @@ get_positive_int(const char *string, const char *name)
 static void
 usage(void)
 {
-
   fprintf(stderr, "Mergecap %s"
 #ifdef SVNVERSION
-	  " (" SVNVERSION " from " SVNPATH ")"
+          " (" SVNVERSION " from " SVNPATH ")"
 #endif
-	  "\n", VERSION);
+          "\n", VERSION);
   fprintf(stderr, "Merge two or more capture files into one.\n");
   fprintf(stderr, "See http://www.wireshark.org for more information.\n");
   fprintf(stderr, "\n");
@@ -137,30 +134,29 @@ usage(void)
 }
 
 struct string_elem {
-    const char *sstr;   /* The short string */
-    const char *lstr;   /* The long string */
+  const char *sstr;     /* The short string */
+  const char *lstr;     /* The long string */
 };
 
 static gint
 string_compare(gconstpointer a, gconstpointer b)
 {
-    return strcmp(((const struct string_elem *)a)->sstr,
-        ((const struct string_elem *)b)->sstr);
+  return strcmp(((const struct string_elem *)a)->sstr,
+                ((const struct string_elem *)b)->sstr);
 }
 
 static gint
 string_nat_compare(gconstpointer a, gconstpointer b)
 {
-    return strnatcmp(((const struct string_elem *)a)->sstr,
-        ((const struct string_elem *)b)->sstr);
+  return strnatcmp(((const struct string_elem *)a)->sstr,
+                   ((const struct string_elem *)b)->sstr);
 }
 
 static void
 string_elem_print(gpointer data, gpointer not_used _U_)
 {
-    fprintf(stderr, "    %s - %s\n",
-        ((struct string_elem *)data)->sstr,
-        ((struct string_elem *)data)->lstr);
+  fprintf(stderr, "    %s - %s\n", ((struct string_elem *)data)->sstr,
+          ((struct string_elem *)data)->lstr);
 }
 
 static void
@@ -186,45 +182,44 @@ list_capture_types(void) {
 
 static void
 list_encap_types(void) {
-    int i;
-    struct string_elem *encaps;
-    GSList *list = NULL;
-
-    encaps = g_new(struct string_elem,WTAP_NUM_ENCAP_TYPES);
-    fprintf(stderr, "mergecap: The available encapsulation types for the \"-T\" flag are:\n");
-    for (i = 0; i < WTAP_NUM_ENCAP_TYPES; i++) {
-        encaps[i].sstr = wtap_encap_short_string(i);
-        if (encaps[i].sstr != NULL) {
-            encaps[i].lstr = wtap_encap_string(i);
-            list = g_slist_insert_sorted(list, &encaps[i], string_nat_compare);
-        }
+  int i;
+  struct string_elem *encaps;
+  GSList *list = NULL;
+
+  encaps = g_new(struct string_elem,WTAP_NUM_ENCAP_TYPES);
+  fprintf(stderr, "mergecap: The available encapsulation types for the \"-T\" flag are:\n");
+  for (i = 0; i < WTAP_NUM_ENCAP_TYPES; i++) {
+    encaps[i].sstr = wtap_encap_short_string(i);
+    if (encaps[i].sstr != NULL) {
+      encaps[i].lstr = wtap_encap_string(i);
+      list = g_slist_insert_sorted(list, &encaps[i], string_nat_compare);
     }
-    g_slist_foreach(list, string_elem_print, NULL);
-    g_slist_free(list);
-    g_free(encaps);
+  }
+  g_slist_foreach(list, string_elem_print, NULL);
+  g_slist_free(list);
+  g_free(encaps);
 }
 
 int
 main(int argc, char *argv[])
 {
   int          opt;
-
-  gboolean     do_append     = FALSE;
-  gboolean     verbose       = FALSE;
+  gboolean     do_append = FALSE;
+  gboolean     verbose = FALSE;
   int          in_file_count = 0;
   guint        snaplen = 0;
 #ifdef PCAP_NG_DEFAULT
-  int          file_type = WTAP_FILE_PCAPNG;	/* default to pcap format */
+  int          file_type = WTAP_FILE_PCAPNG;    /* default to pcap format */
 #else
-  int          file_type = WTAP_FILE_PCAP;	/* default to pcapng format */
+  int          file_type = WTAP_FILE_PCAP;      /* default to pcapng format */
 #endif
   int          frame_type = -2;
   int          out_fd;
-  merge_in_file_t   *in_files      = NULL, *in_file;
+  merge_in_file_t   *in_files = NULL, *in_file;
   int          i;
   struct wtap_pkthdr *phdr, snap_phdr;
   wtap_dumper *pdh;
-  int          open_err, read_err=0, write_err, close_err;
+  int          open_err, read_err = 0, write_err, close_err;
   gchar       *err_info;
   int          err_fileno;
   char        *out_filename = NULL;
@@ -237,48 +232,48 @@ main(int argc, char *argv[])
 #endif /* _WIN32 */
 
   /* Process the options first */
-  while ((opt = getopt(argc, argv, "hvas:T:F:w:")) != -1) {
+  while ((opt = getopt(argc, argv, "aF:hs:T:vw:")) != -1) {
 
     switch (opt) {
-    case 'w':
-      out_filename = optarg;
-      break;
-
     case 'a':
       do_append = !do_append;
       break;
 
-    case 'T':
-      frame_type = wtap_short_string_to_encap(optarg);
-      if (frame_type < 0) {
-      	fprintf(stderr, "mergecap: \"%s\" isn't a valid encapsulation type\n",
-      	    optarg);
-        list_encap_types();
-      	exit(1);
-      }
-      break;
-
     case 'F':
       file_type = wtap_short_string_to_file_type(optarg);
       if (file_type < 0) {
-      	fprintf(stderr, "mergecap: \"%s\" isn't a valid capture file type\n",
-      	    optarg);
+        fprintf(stderr, "mergecap: \"%s\" isn't a valid capture file type\n",
+                optarg);
         list_capture_types();
-      	exit(1);
+        exit(1);
       }
       break;
 
-    case 'v':
-      verbose = TRUE;
+    case 'h':
+      usage();
+      exit(0);
       break;
 
     case 's':
       snaplen = get_positive_int(optarg, "snapshot length");
       break;
 
-    case 'h':
-      usage();
-      exit(0);
+    case 'T':
+      frame_type = wtap_short_string_to_encap(optarg);
+      if (frame_type < 0) {
+        fprintf(stderr, "mergecap: \"%s\" isn't a valid encapsulation type\n",
+                optarg);
+        list_encap_types();
+        exit(1);
+      }
+      break;
+
+    case 'v':
+      verbose = TRUE;
+      break;
+
+    case 'w':
+      out_filename = optarg;
       break;
 
     case '?':              /* Bad options if GNU getopt */
@@ -294,9 +289,7 @@ main(int argc, char *argv[])
       }
       exit(1);
       break;
-
     }
-
   }
 
   /* check for proper args; at a minimum, must have an output
@@ -317,7 +310,7 @@ main(int argc, char *argv[])
   if (!merge_open_in_files(in_file_count, &argv[optind], &in_files,
                            &open_err, &err_info, &err_fileno)) {
     fprintf(stderr, "mergecap: Can't open %s: %s\n", argv[optind + err_fileno],
-        wtap_strerror(open_err));
+            wtap_strerror(open_err));
     switch (open_err) {
 
     case WTAP_ERR_UNSUPPORTED:
@@ -397,27 +390,27 @@ main(int argc, char *argv[])
 
   /* prepare the outfile */
   if(file_type == WTAP_FILE_PCAPNG ){
-    wtapng_section_t	*shb_hdr;
+    wtapng_section_t *shb_hdr;
     GString *comment_gstr;
 
     shb_hdr = g_new(wtapng_section_t,1);
     comment_gstr = g_string_new("File created by merging: \n");
 
     for (i = 0; i < in_file_count; i++) {
-        g_string_append_printf(comment_gstr, "File%d: %s \n",i+1,in_files[i].filename);
+      g_string_append_printf(comment_gstr, "File%d: %s \n",i+1,in_files[i].filename);
     }
     shb_hdr->section_length = -1;
     /* options */
-    shb_hdr->opt_comment   =	comment_gstr->str;		/* NULL if not available */
-    shb_hdr->shb_hardware  =	NULL;		/* NULL if not available, UTF-8 string containing the description of the hardware used to create this section. */
-    shb_hdr->shb_os        =	NULL;		/* NULL if not available, UTF-8 string containing the name of the operating system used to create this section. */
-    shb_hdr->shb_user_appl =	"mergecap";	/* NULL if not available, UTF-8 string containing the name of the application used to create this section. */
+    shb_hdr->opt_comment   = comment_gstr->str; /* NULL if not available */
+    shb_hdr->shb_hardware  = NULL;              /* NULL if not available, UTF-8 string containing the description of the hardware used to create this section. */
+    shb_hdr->shb_os        = NULL;              /* NULL if not available, UTF-8 string containing the name of the operating system used to create this section. */
+    shb_hdr->shb_user_appl = "mergecap";        /* NULL if not available, UTF-8 string containing the name of the application used to create this section. */
 
     pdh = wtap_dump_fdopen_ng(out_fd, file_type, frame_type, snaplen,
                               FALSE /* compressed */, shb_hdr, NULL /* wtapng_iface_descriptions_t *idb_inf */, &open_err);
     g_string_free(comment_gstr, TRUE);
-  }else{
-       pdh = wtap_dump_fdopen(out_fd, file_type, frame_type, snaplen, FALSE /* compressed */, &open_err);
+  } else {
+    pdh = wtap_dump_fdopen(out_fd, file_type, frame_type, snaplen, FALSE /* compressed */, &open_err);
   }
   if (pdh == NULL) {
     merge_close_in_files(in_file_count, in_files);
@@ -516,3 +509,17 @@ main(int argc, char *argv[])
 
   return (!got_read_error && !got_write_error) ? 0 : 2;
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 2
+ * tab-width: 2
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=2 tabstop=2 expandtab:
+ * :indentSize=2:tabSize=2:noTabs=true:
+ */
+