QUIC: fix null-ptr dereference in gQUIC version check

[metze/wireshark/wip.git] / ui / commandline.h

diff --git a/ui/commandline.h b/ui/commandline.h
index 0953f126d245bd2b06f04784014d6199c6c50c43..e88b0e16f7a31019f3fe96fcba4a2d6fa70ca807 100644 (file)
--- a/ui/commandline.h
+++ b/ui/commandline.h
@@ -5,19 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __COMMANDLINE_H__
@@ -29,35 +17,32 @@ extern "C" {
 
 extern void commandline_print_usage(gboolean for_help_option);
 
-typedef struct commandline_capture_param_info
-{
-    GString *comp_info_str;
-    GString *runtime_info_str;
-} commandline_capture_param_info_t;
-
-extern void commandline_early_options(int argc, char *argv[], commandline_capture_param_info_t* param_info);
+extern void commandline_early_options(int argc, char *argv[],
+    GString *comp_info_str, GString *runtime_info_str);
 
 /* Command-line options that don't have direct API calls to handle the data */
 typedef struct commandline_param_info
 {
 #ifdef HAVE_LIBPCAP
     gboolean list_link_layer_types;
+    gboolean list_timestamp_types;
     gboolean start_capture;
+    gboolean quit_after_cap;
 #endif
     e_prefs *prefs_p;
     search_direction jump_backwards;
-    guint go_to_packet;
+    guint32 go_to_packet;
     gchar* jfilter;
     gchar* cf_name;
     gchar* rfilter;
     gchar* dfilter;
-    GSList *disable_protocol_slist;
-    GSList *enable_heur_slist;
-    GSList *disable_heur_slist;
+    gboolean full_screen;
 
 } commandline_param_info_t;
 
-extern void commandline_other_options(int argc, char *argv[], commandline_param_info_t* param_info, gboolean opt_reset);
+extern void commandline_other_options(int argc, char *argv[], gboolean opt_reset);
+
+extern commandline_param_info_t global_commandline_info;
 
 #ifdef __cplusplus
 }