Remove the fixed maximum number of subranges in a range_t; dynamically

allocate them to be large enough.

Add checks that the numbers in the range fit in a guint32.

Check the validity of a range before saving or printing, and report
errors in an alert box.

Clean up white space.

svn path=/trunk/; revision=12320

1 files changed, 7 insertions, 3 deletions

diff --git a/packet-range.h b/packet-range.h
index 3007d215c8..b4e9f66bc9 100644
--- a/packet-range.h
+++ b/packet-range.h
@@ -49,8 +49,9 @@ typedef struct packet_range_tag {
     packet_range_e  process;            /* which range to process */
     gboolean        process_filtered;   /* captured or filtered packets */
 
-    /* user specified range(s) */
-    range_t         user_range;
+    /* user specified range(s) and, if null, error status */
+    range_t         *user_range;
+    convert_ret_t   user_range_status;
 
     /* calculated values */
     guint32  selected_packet;       /* the currently selected packet */
@@ -82,8 +83,11 @@ typedef enum {
 /* init the range structure */
 extern void packet_range_init(packet_range_t *range);
 
+/* check whether the packet range is OK */
+extern convert_ret_t packet_range_check(packet_range_t *range);
+
 /* init the processing run */
-void packet_range_process_init(packet_range_t *range);
+extern void packet_range_process_init(packet_range_t *range);
 
 /* do we have to process all packets? */
 extern gboolean packet_range_process_all(packet_range_t *range);