More signed vs. unsigned argument cleanups.

Use the get.*guint32 routines to get unsigned values.

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

4 files changed, 7 insertions, 7 deletions

diff --git a/capture_opts.c b/capture_opts.c
index e014290f35..d382448d0a 100644
--- a/capture_opts.c
+++ b/capture_opts.c
@@ -270,7 +270,7 @@ set_autostop_criterion(capture_options *capture_opts, const char *autostoparg)
         capture_opts->autostop_duration = get_positive_int(p,"autostop duration");
     } else if (strcmp(autostoparg,"filesize") == 0) {
         capture_opts->has_autostop_filesize = TRUE;
-        capture_opts->autostop_filesize = get_positive_int(p,"autostop filesize");
+        capture_opts->autostop_filesize = get_nonzero_guint32(p,"autostop filesize");
     } else if (strcmp(autostoparg,"files") == 0) {
         capture_opts->multi_files_on = TRUE;
         capture_opts->has_autostop_files = TRUE;
@@ -373,10 +373,10 @@ get_ring_arguments(capture_options *capture_opts, const char *arg)
 
     if (strcmp(arg,"files") == 0) {
         capture_opts->has_ring_num_files = TRUE;
-        capture_opts->ring_num_files = get_positive_int(p, "number of ring buffer files");
+        capture_opts->ring_num_files = get_nonzero_guint32(p, "number of ring buffer files");
     } else if (strcmp(arg,"filesize") == 0) {
         capture_opts->has_autostop_filesize = TRUE;
-        capture_opts->autostop_filesize = get_positive_int(p, "ring buffer filesize");
+        capture_opts->autostop_filesize = get_nonzero_guint32(p, "ring buffer filesize");
     } else if (strcmp(arg,"duration") == 0) {
         capture_opts->has_file_duration = TRUE;
         capture_opts->file_duration = get_positive_int(p, "ring buffer duration");
diff --git a/mergecap.c b/mergecap.c
index 1476e0fe5d..94fb70b7f0 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -251,7 +251,7 @@ main(int argc, char *argv[])
   gboolean            do_append          = FALSE;
   gboolean            verbose            = FALSE;
   int                 in_file_count      = 0;
-  guint               snaplen            = 0;
+  guint32             snaplen            = 0;
 #ifdef PCAP_NG_DEFAULT
   int                 file_type          = WTAP_FILE_TYPE_SUBTYPE_PCAPNG; /* default to pcap format */
 #else
@@ -362,7 +362,7 @@ main(int argc, char *argv[])
       break;
 
     case 's':
-      snaplen = get_positive_int(optarg, "snapshot length");
+      snaplen = get_nonzero_guint32(optarg, "snapshot length");
       break;
 
     case 'v':
diff --git a/ui/commandline.c b/ui/commandline.c
index e936a327b9..ad6ee5cd67 100644
--- a/ui/commandline.c
+++ b/ui/commandline.c
@@ -451,7 +451,7 @@ void commandline_other_options(int argc, char *argv[], gboolean opt_reset)
                 global_commandline_info.jump_backwards = SD_BACKWARD;
                 break;
             case 'g':        /* Go to packet with the given packet number */
-                global_commandline_info.go_to_packet = get_positive_int(optarg, "go to packet");
+                global_commandline_info.go_to_packet = get_nonzero_guint32(optarg, "go to packet");
                 break;
             case 'J':        /* Jump to the first packet which matches the filter criteria */
                 global_commandline_info.jfilter = optarg;
diff --git a/ui/commandline.h b/ui/commandline.h
index 9d770fb678..0a20ad37f2 100644
--- a/ui/commandline.h
+++ b/ui/commandline.h
@@ -42,7 +42,7 @@ typedef struct commandline_param_info
 #endif
     e_prefs *prefs_p;
     search_direction jump_backwards;
-    guint go_to_packet;
+    guint32 go_to_packet;
     gchar* jfilter;
     gchar* cf_name;
     gchar* rfilter;