Use an enum for compression types in various interfaces.

This:

1) means that we don't have to flag the compression argument with a
comment to indicate what it means (FALSE doesn't obviously say "not
compressed", WTAP_UNCOMPRESSED does);

2) leaves space in the interfaces in question for additional compression
types.

(No, this is not part 1 of an implementation of additional compression
types, it's just an API cleanup.  Implementing additional compression
types involves significant work in libwiretap, as well as UI changes to
replace "compress the file" checkboxes with something to indicate *how*
to compress the file, or to always use some other form of compression).

Change-Id: I1d23dc720be10158e6b34f97baa247ba8a537abf
Reviewed-on: https://code.wireshark.org/review/30660
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 35 insertions, 35 deletions

diff --git a/ui/summary.h b/ui/summary.h
index ebf8e5cb8a..9c345944eb 100644
--- a/ui/summary.h
+++ b/ui/summary.h
@@ -33,42 +33,42 @@ typedef struct iface_summary_info_tag {
 #define HASH_STR_SIZE (65) /* Max hash size * 2 + '\0' */
 
 typedef struct _summary_tally {
-  guint64      bytes;              /**< total bytes */
-  double       start_time;         /**< seconds, with msec resolution */
-  double       stop_time;          /**< seconds, with msec resolution */
-  double       elapsed_time;       /**< seconds, with msec resolution,
-                                     includes time before first packet
-                                     and after last packet */
-  guint32      marked_count;       /**< number of marked packets */
-  guint32      marked_count_ts;    /**< number of time-stamped marked packets */
-  guint64      marked_bytes;       /**< total bytes in the marked packets */
-  double       marked_start;       /**< time in seconds, with msec resolution */
-  double       marked_stop;        /**< time in seconds, with msec resolution */
-  guint32      ignored_count;      /**< number of ignored packets */
-  guint32      packet_count;       /**< total number of packets in trace */
-  guint32      packet_count_ts;    /**< total number of time-stamped packets in trace */
-  guint32      filtered_count;     /**< number of filtered packets */
-  guint32      filtered_count_ts;  /**< number of time-stamped filtered packets */
-  guint64      filtered_bytes;     /**< total bytes in the filtered packets */
-  double       filtered_start;     /**< time in seconds, with msec resolution */
-  double       filtered_stop;      /**< time in seconds, with msec resolution */
-  const char  *filename;           /**< path of capture file */
-  gint64       file_length;        /**< file length in bytes */
-  gchar        file_sha256[HASH_STR_SIZE];  /**< SHA256 hash of capture file */
-  gchar        file_rmd160[HASH_STR_SIZE];  /**< RIPEMD160 hash of capture file */
-  gchar        file_sha1[HASH_STR_SIZE];    /**< SHA1 hash of capture file */
-  int          file_type;          /**< wiretap file type */
-  int          iscompressed;       /**< TRUE if file is compressed */
-  int          file_encap_type;    /**< wiretap encapsulation type for file */
-  GArray      *packet_encap_types; /**< wiretap encapsulation types for packets */
-  int          snap;               /**< Maximum captured packet length; 0 if not known */
-  gboolean     drops_known;        /**< TRUE if number of packet drops is known */
-  guint64      drops;              /**< number of packet drops */
-  const char  *dfilter;            /**< display filter */
-  gboolean     is_tempfile;
+  guint64               bytes;              /**< total bytes */
+  double                start_time;         /**< seconds, with msec resolution */
+  double                stop_time;          /**< seconds, with msec resolution */
+  double                elapsed_time;       /**< seconds, with msec resolution,
+                                              includes time before first packet
+                                              and after last packet */
+  guint32               marked_count;       /**< number of marked packets */
+  guint32               marked_count_ts;    /**< number of time-stamped marked packets */
+  guint64               marked_bytes;       /**< total bytes in the marked packets */
+  double                marked_start;       /**< time in seconds, with msec resolution */
+  double                marked_stop;        /**< time in seconds, with msec resolution */
+  guint32               ignored_count;      /**< number of ignored packets */
+  guint32               packet_count;       /**< total number of packets in trace */
+  guint32               packet_count_ts;    /**< total number of time-stamped packets in trace */
+  guint32               filtered_count;     /**< number of filtered packets */
+  guint32               filtered_count_ts;  /**< number of time-stamped filtered packets */
+  guint64               filtered_bytes;     /**< total bytes in the filtered packets */
+  double                filtered_start;     /**< time in seconds, with msec resolution */
+  double                filtered_stop;      /**< time in seconds, with msec resolution */
+  const char           *filename;           /**< path of capture file */
+  gint64                file_length;        /**< file length in bytes */
+  gchar                 file_sha256[HASH_STR_SIZE];  /**< SHA256 hash of capture file */
+  gchar                 file_rmd160[HASH_STR_SIZE];  /**< RIPEMD160 hash of capture file */
+  gchar                 file_sha1[HASH_STR_SIZE];    /**< SHA1 hash of capture file */
+  int                   file_type;          /**< wiretap file type */
+  wtap_compression_type compression_type;   /**< compression type of file, or uncompressed */
+  int                   file_encap_type;    /**< wiretap encapsulation type for file */
+  GArray               *packet_encap_types; /**< wiretap encapsulation types for packets */
+  int                   snap;               /**< Maximum captured packet length; 0 if not known */
+  gboolean              drops_known;        /**< TRUE if number of packet drops is known */
+  guint64               drops;              /**< number of packet drops */
+  const char           *dfilter;            /**< display filter */
+  gboolean              is_tempfile;
   /* capture related, use summary_fill_in_capture() to get values */
-  GArray      *ifaces;
-  gboolean     legacy;
+  GArray               *ifaces;
+  gboolean              legacy;
 } summary_tally;
 
 extern void