aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>2003-07-25 04:11:51 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>2003-07-25 04:11:51 +0000
commitc91b8e713ff5568ab53aedff226b01cd4d0adf23 (patch)
treefff0a64355ea11d6a96c20fc571ebbc48478decd /gtk
parent086774b71f236b797a9e7a14e2bbb444b55e6d79 (diff)
Fix signed/unsigned comparison warnings.
svn path=/trunk/; revision=8084
Diffstat (limited to 'gtk')
-rw-r--r--gtk/capture_dlg.c10
-rw-r--r--gtk/main.c10
2 files changed, 12 insertions, 8 deletions
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 2bf3b95147..a6fa99f727 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -1,7 +1,7 @@
/* capture_dlg.c
* Routines for packet capture windows
*
- * $Id: capture_dlg.c,v 1.78 2003/05/15 13:38:05 deniel Exp $
+ * $Id: capture_dlg.c,v 1.79 2003/07/25 04:11:50 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -900,10 +900,12 @@ capture_prep_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) {
capture_opts.ringbuffer_num_files =
gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(ringbuffer_nbf_sb));
- if (capture_opts.ringbuffer_num_files < RINGBUFFER_MIN_NUM_FILES)
- capture_opts.ringbuffer_num_files = RINGBUFFER_MIN_NUM_FILES;
- else if (capture_opts.ringbuffer_num_files > RINGBUFFER_MAX_NUM_FILES)
+ if (capture_opts.ringbuffer_num_files > RINGBUFFER_MAX_NUM_FILES)
capture_opts.ringbuffer_num_files = RINGBUFFER_MAX_NUM_FILES;
+#if RINGBUFFER_MIN_NUM_FILES > 0
+ else if (capture_opts.ringbuffer_num_files < RINGBUFFER_MIN_NUM_FILES)
+ capture_opts.ringbuffer_num_files = RINGBUFFER_MIN_NUM_FILES;
+#endif
capture_opts.has_ring_duration =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ring_duration_cb));
diff --git a/gtk/main.c b/gtk/main.c
index b3c72ae6be..093f4277f9 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
/* main.c
*
- * $Id: main.c,v 1.302 2003/07/19 10:25:59 oabad Exp $
+ * $Id: main.c,v 1.303 2003/07/25 04:11:51 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -2049,10 +2049,12 @@ main(int argc, char *argv[])
}
/* Check the value range of the ringbuffer_num_files parameter */
- if (capture_opts.ringbuffer_num_files < RINGBUFFER_MIN_NUM_FILES)
- capture_opts.ringbuffer_num_files = RINGBUFFER_MIN_NUM_FILES;
- else if (capture_opts.ringbuffer_num_files > RINGBUFFER_MAX_NUM_FILES)
+ if (capture_opts.ringbuffer_num_files > RINGBUFFER_MAX_NUM_FILES)
capture_opts.ringbuffer_num_files = RINGBUFFER_MAX_NUM_FILES;
+#if RINGBUFFER_MIN_NUM_FILES > 0
+ else if (capture_opts.ringbuffer_num_files < RINGBUFFER_MIN_NUM_FILES)
+ capture_opts.ringbuffer_num_files = RINGBUFFER_MIN_NUM_FILES;
+#endif
#endif
rc_file = get_persconffile_path(RC_FILE, FALSE);