Move UI-only stuff out of libwireshark.

Packet ranges are used only in the UI; move the packet range stuff into
libui.

Don't pass a print_args_t structure to libwireshark packet-printing
routines, just pass the few parameters they need.  Move the declaration
of print_args_t into file.h.

Change-Id: Icff5991eea7d7d56f33b4716105895263d275bcf
Reviewed-on: https://code.wireshark.org/review/21308
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 13 insertions, 29 deletions

diff --git a/epan/print.h b/epan/print.h
index ef7330bd2b..6dedc30878 100644
--- a/epan/print.h
+++ b/epan/print.h
@@ -32,8 +32,6 @@
 
 #include <epan/print_stream.h>
 
-#include <epan/packet_range.h>
-
 #include "ws_symbol_export.h"
 
 #ifdef __cplusplus
@@ -46,14 +44,6 @@ typedef enum {
   PR_FMT_PS       /* postscript */
 } print_format_e;
 
-/* print_range, enum which frames should be printed */
-typedef enum {
-  print_range_selected_only,    /* selected frame(s) only (currently only one) */
-  print_range_marked_only,      /* marked frames only */
-  print_range_all_displayed,    /* all frames currently displayed */
-  print_range_all_captured      /* all frames in capture */
-} print_range_e;
-
 /* print_dissections, enum how the dissections should be printed */
 typedef enum {
   print_dissections_none,         /* no dissections at all */
@@ -62,22 +52,6 @@ typedef enum {
   print_dissections_expanded      /* all dissection details */
 } print_dissections_e;
 
-typedef struct {
-  print_stream_t *stream;       /* the stream to which we're printing */
-  print_format_e format;        /* plain text or PostScript */
-  gboolean to_file;             /* TRUE if we're printing to a file */
-  char *file;                   /* file output pathname */
-  char *cmd;                    /* print command string (not win32) */
-  packet_range_t range;
-
-  gboolean print_summary;       /* TRUE if we should print summary line. */
-  gboolean print_col_headings;  /* TRUE if we should print column headings */
-  print_dissections_e print_dissections;
-  gboolean print_hex;           /* TRUE if we should print hex data;
-                                 * FALSE if we should print only if not dissected. */
-  gboolean print_formfeed;      /* TRUE if a formfeed should be printed before
-                                 * each new packet */
-} print_args_t;
 
 typedef enum {
   FORMAT_CSV,     /* CSV */
@@ -110,7 +84,8 @@ WS_DLL_PUBLIC gboolean output_fields_has_cols(output_fields_t* info);
  * Higher-level packet-printing code.
  */
 
-WS_DLL_PUBLIC gboolean proto_tree_print(print_args_t *print_args,
+WS_DLL_PUBLIC gboolean proto_tree_print(print_dissections_e print_dissections,
+                                        gboolean print_hex_data,
                                         epan_dissect_t *edt,
                                         GHashTable *output_only_tables,
                                         print_stream_t *stream);
@@ -121,10 +96,19 @@ WS_DLL_PUBLIC void write_pdml_proto_tree(output_fields_t* fields, gchar **protoc
 WS_DLL_PUBLIC void write_pdml_finale(FILE *fh);
 
 WS_DLL_PUBLIC void write_json_preamble(FILE *fh);
-WS_DLL_PUBLIC void write_json_proto_tree(output_fields_t* fields, print_args_t *print_args, gchar **protocolfilter, pf_flags protocolfilter_flags, epan_dissect_t *edt, FILE *fh);
+WS_DLL_PUBLIC void write_json_proto_tree(output_fields_t* fields,
+                                         print_dissections_e print_dissections,
+                                         gboolean print_hex_data,
+                                         gchar **protocolfilter,
+                                         pf_flags protocolfilter_flags,
+                                         epan_dissect_t *edt, FILE *fh);
 WS_DLL_PUBLIC void write_json_finale(FILE *fh);
 
-WS_DLL_PUBLIC void write_ek_proto_tree(output_fields_t* fields, print_args_t *print_args, gchar **protocolfilter, pf_flags protocolfilter_flags, epan_dissect_t *edt, FILE *fh);
+WS_DLL_PUBLIC void write_ek_proto_tree(output_fields_t* fields,
+                                       gboolean print_hex_data,
+                                       gchar **protocolfilter,
+                                       pf_flags protocolfilter_flags,
+                                       epan_dissect_t *edt, FILE *fh);
 
 WS_DLL_PUBLIC void write_psml_preamble(column_info *cinfo, FILE *fh);
 WS_DLL_PUBLIC void write_psml_columns(epan_dissect_t *edt, FILE *fh);