Fix Coverity 524: NEGATIVE_RETURNS

[obnox/wireshark/wip.git] / cfile.h

diff --git a/cfile.h b/cfile.h
index ced0aa81d815989763881978f497a2e5a4d153ad..a54fddc0a0da2f4645b1bfa22bd2a2a5011d1b53 100644 (file)
--- a/cfile.h
+++ b/cfile.h
@@ -41,18 +41,25 @@ typedef enum {
   /* add EBCDIC when it's implemented */
 } search_charset_t;
 
+typedef enum {
+  SD_FORWARD,
+  SD_BACKWARD
+} search_direction;
+
 typedef struct _capture_file {
   file_state   state;           /* Current state of capture file */
   gchar       *filename;        /* Name of capture file */
+  gchar       *source;          /* Temp file source, e.g. "Pipe from elsewhere" */
   gboolean     is_tempfile;     /* Is capture file a temporary file? */
   gboolean     user_saved;      /* If capture file is temporary, has it been saved by user yet? */
   gint64       f_datalen;       /* Size of capture file data (uncompressed) */
   guint16      cd_t;            /* File type of capture file */
   int          lnk_t;           /* Link-layer type with which to save capture */
-  guint32      vers;            /* Version.  For tcpdump minor is appended to major */
   int          count;           /* Total number of frames */
   int          displayed_count; /* Number of displayed frames */
   int          marked_count;    /* Number of marked frames */
+  int          ignored_count;   /* Number of ignored frames */
+  int          ref_time_count;  /* Number of time referenced frames */
   gboolean     drops_known;     /* TRUE if we know how many packets were dropped */
   guint32      drops;           /* Dropped packets */
   nstime_t     elapsed_time;    /* Elapsed time */
@@ -63,15 +70,17 @@ typedef struct _capture_file {
   gchar       *dfilter;         /* Display filter string */
   gboolean     redissecting;    /* TRUE if currently redissecting (cf_redissect_packets) */
   /* search */
-  gchar       *sfilter;         /* Search filter string */
-  gboolean     sbackward;       /* TRUE if search is backward, FALSE if forward */
-  gboolean     hex;             /* TRUE is raw data search is being performed */
-  gboolean     string;          /* TRUE is text search is being performed */
-  guint32      search_pos;      /* Position of last character found in search */
-  search_charset_t scs_type;    /* Character set for text search */
+  gchar       *sfilter;         /* Filter, hex value, or string being searched */
+  gboolean     hex;             /* TRUE if "Hex value" search was last selected */
+  gboolean     string;          /* TRUE if "String" search was last selected */
+  gboolean     summary_data;    /* TRUE if "String" search in "Packet list" (Info column) was last selected */
+  gboolean     decode_data;     /* TRUE if "String" search in "Packet details" was last selected */
+  gboolean     packet_data;     /* TRUE if "String" search in "Packet data" was last selected */
+  guint32      search_pos;      /* Byte position of last byte found in a hex search */
   gboolean     case_type;       /* TRUE if case-insensitive text search */
-  gboolean     decode_data;     /* TRUE if searching protocol tree text */
-  gboolean     summary_data;    /* TRUE if searching Info column text */
+  search_charset_t scs_type;    /* Character set for text search */
+  search_direction dir;         /* Direction in which to do searches */
+  gboolean     search_in_progress; /* TRUE if user just clicked OK in the Find dialog or hit <control>N/B */
   /* packet data */
   union wtap_pseudo_header pseudo_header; /* Packet pseudo_header */
   guint8       pd[WTAP_MAX_PACKET_SIZE];  /* Packet data */
@@ -94,6 +103,8 @@ typedef struct _capture_file {
   field_info  *finfo_selected; /* Field info for currently selected field */
 } capture_file;
 
-void init_cap_file(capture_file *cf);
+void cap_file_init(capture_file *cf);
+
+void cap_file_add_fdata(capture_file *cf, frame_data *fdata);
 
 #endif /* cfile.h */