Directly use wtap_opttypes calls to fetch SHB options.

Don't put them in the summary structure; the summary routines should
calculate summary statistics, not dig up every bit of information that
*could* appear in a summary.

Instead, have the GUI code call wtap_file_get_shb() to get the SHB
information and call wtap_optionblock_get_option_string() to fetch the
option values.

Move the option code definitions into wtap_opttypes.h, as they're used
by the API.

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

1 files changed, 0 insertions, 5 deletions

diff --git a/summary.h b/summary.h
index 699ebf4049..68634ad9d9 100644
--- a/summary.h
+++ b/summary.h
@@ -75,11 +75,6 @@ typedef struct _summary_tally {
   guint64      drops;              /**< number of packet drops */
   const char  *dfilter;            /**< display filter */
   gboolean     is_tempfile;
-  /* from SHB, use summary_fill_shb_inf() to get values */
-  gchar       *opt_comment;        /**< comment from SHB block */
-  gchar       *shb_hardware;       /**< Capture HW from SHB block */
-  gchar       *shb_os;             /**< The OS the capture was made on from SHB block */
-  const gchar *shb_user_appl;      /**< The application that made the capture from SHB block */
   /* capture related, use summary_fill_in_capture() to get values */
   GArray      *ifaces;
   gboolean     legacy;