diff options
| -rw-r--r-- | ui/commandline.c | 1 | ||||
| -rw-r--r-- | ui/dissect_opts.c | 16 | ||||
| -rw-r--r-- | ui/dissect_opts.h | 4 |
3 files changed, 4 insertions, 17 deletions
diff --git a/ui/commandline.c b/ui/commandline.c index e39e2e9d96..c203281bfc 100644 --- a/ui/commandline.c +++ b/ui/commandline.c @@ -417,7 +417,6 @@ void commandline_other_options(int argc, char *argv[], gboolean opt_reset) } /* Initialize with default values */ - dissect_opts_init(); global_commandline_info.jump_backwards = SD_FORWARD; global_commandline_info.go_to_packet = 0; global_commandline_info.jfilter = NULL; diff --git a/ui/dissect_opts.c b/ui/dissect_opts.c index 27c21dfaa6..e26653d316 100644 --- a/ui/dissect_opts.c +++ b/ui/dissect_opts.c @@ -35,18 +35,10 @@ #include "ui/dissect_opts.h" -dissect_options global_dissect_options; - -void -dissect_opts_init(void) -{ - global_dissect_options.time_format = TS_NOT_SET; - global_dissect_options.time_precision = TS_PREC_NOT_SET; - global_dissect_options.disable_protocol_slist = NULL; - global_dissect_options.enable_protocol_slist = NULL; - global_dissect_options.enable_heur_slist = NULL; - global_dissect_options.disable_heur_slist = NULL; -} +dissect_options global_dissect_options = { + .time_format = TS_NOT_SET, + .time_precision = TS_PREC_NOT_SET +}; gboolean dissect_opts_handle_opt(int opt, char *optarg_str_p) diff --git a/ui/dissect_opts.h b/ui/dissect_opts.h index 6dd22c790e..6c2c4446b5 100644 --- a/ui/dissect_opts.h +++ b/ui/dissect_opts.h @@ -62,10 +62,6 @@ typedef struct dissect_options_tag { extern dissect_options global_dissect_options; -/* initialize the dissect_options with some reasonable values */ -extern void -dissect_opts_init(void); - /* * Handle a command line option. * Returns TRUE if the option is valid, FALSE if not; an error message |