Fix build by #if 0 out unused de_sgsap_tmsi() function.

[obnox/wireshark/wip.git] / gtk / capture_dlg.c

diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index a66775b4ffd9251c13acd25c4f2c70a9b4a75090..1fbce6f8ea870c3e27000ed6acb2c9519249d7ef 100644 (file)
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -264,8 +264,9 @@ capture_filter_check_syntax_cb(GtkWidget *w _U_, gpointer user_data _U_)
     return;
   }
 
+  /* pcap_compile_nopcap will not alter the filter string, so the (char *) cast is "safe" */
   if (pcap_compile_nopcap(DUMMY_SNAPLENGTH /* use a dummy snaplength for syntax-checking */,
-          global_capture_opts.linktype, &fcode, filter_text, 1 /* Do optimize */, 
+          global_capture_opts.linktype, &fcode, (char *)filter_text, 1 /* Do optimize */,
           DUMMY_NETMASK /* use a dummy netmask for syntax-checking */) < 0) {
     colorize_filter_te_as_invalid(filter_te);
   } else {
@@ -1506,6 +1507,7 @@ capture_remote_combo_add_recent(gchar *s)
 
 #endif
 
+#if defined(HAVE_PCAP_OPEN_DEAD) && defined(HAVE_BPF_IMAGE)
 static void
 capture_filter_compile_cb(GtkWidget *w _U_, gpointer user_data _U_)
 {
@@ -1521,10 +1523,11 @@ capture_filter_compile_cb(GtkWidget *w _U_, gpointer user_data _U_)
   filter_te = GTK_COMBO(filter_cm)->entry;
   filter_text = gtk_entry_get_text(GTK_ENTRY(filter_te));
 
+  /* pcap_compile will not alter the filter string, so the (char *) cast is "safe" */
 #ifdef PCAP_NETMASK_UNKNOWN
-  if (pcap_compile(pd, &fcode, filter_text, 1 /* Do optimize */, PCAP_NETMASK_UNKNOWN) < 0) {
+  if (pcap_compile(pd, &fcode, (char *)filter_text, 1 /* Do optimize */, PCAP_NETMASK_UNKNOWN) < 0) {
 #else
-  if (pcap_compile(pd, &fcode, filter_text, 1 /* Do optimize */, 0) < 0) {
+  if (pcap_compile(pd, &fcode, (char *)filter_text, 1 /* Do optimize */, 0) < 0) {
 #endif
     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", pcap_geterr(pd));
   } else {
@@ -1551,6 +1554,7 @@ capture_filter_compile_cb(GtkWidget *w _U_, gpointer user_data _U_)
 
   pcap_close(pd);
 }
+#endif
 
 /* show capture prepare (options) dialog */
 void
@@ -1570,7 +1574,9 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
 #endif
                 *pcap_ng_cb,
                 *filter_hb, *filter_bt, *filter_te, *filter_cm,
+#if defined(HAVE_PCAP_OPEN_DEAD) && defined(HAVE_BPF_IMAGE)
                 *compile_bt,
+#endif
                 *file_fr, *file_vb,
                 *file_hb, *file_bt, *file_lb, *file_te,
                 *multi_tb, *multi_files_on_cb,
@@ -1951,12 +1957,14 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   /* let an eventually capture filters dialog know the text entry to fill in */
   g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_te);
 
+#if defined(HAVE_PCAP_OPEN_DEAD) && defined(HAVE_BPF_IMAGE)
   compile_bt = gtk_button_new_with_label("Compile BPF");
   g_signal_connect(compile_bt, "clicked", G_CALLBACK(capture_filter_compile_cb), NULL);
   gtk_tooltips_set_tip(tooltips, compile_bt,
-    "Compile the capture filter expression and show the BPF code.",
+    "Compile the capture filter expression and show the BPF (Berkeley Packet Filter) code.",
     NULL);
   gtk_box_pack_start(GTK_BOX(filter_hb), compile_bt, FALSE, FALSE, 3);
+#endif
 
   /* advanced row */
 #ifdef HAVE_AIRPCAP
@@ -2302,7 +2310,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   m_resolv_cb = gtk_check_button_new_with_mnemonic(
                 "Enable _MAC name resolution");
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_resolv_cb),
-                g_resolv_flags & RESOLV_MAC);
+                gbl_resolv_flags & RESOLV_MAC);
   gtk_tooltips_set_tip(tooltips, m_resolv_cb,
     "Perform MAC layer name resolution while capturing.", NULL);
   gtk_container_add(GTK_CONTAINER(resolv_vb), m_resolv_cb);
@@ -2310,7 +2318,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   n_resolv_cb = gtk_check_button_new_with_mnemonic(
                 "Enable _network name resolution");
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(n_resolv_cb),
-                g_resolv_flags & RESOLV_NETWORK);
+                gbl_resolv_flags & RESOLV_NETWORK);
   gtk_tooltips_set_tip(tooltips, n_resolv_cb,
     "Perform network layer name resolution while capturing.", NULL);
   gtk_container_add(GTK_CONTAINER(resolv_vb), n_resolv_cb);
@@ -2318,7 +2326,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   t_resolv_cb = gtk_check_button_new_with_mnemonic(
                 "Enable _transport name resolution");
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(t_resolv_cb),
-                g_resolv_flags & RESOLV_TRANSPORT);
+                gbl_resolv_flags & RESOLV_TRANSPORT);
   gtk_tooltips_set_tip(tooltips, t_resolv_cb,
     "Perform transport layer name resolution while capturing.", NULL);
   gtk_container_add(GTK_CONTAINER(resolv_vb), t_resolv_cb);
@@ -2884,17 +2892,17 @@ capture_dlg_prep(gpointer parent_w) {
       !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(hide_info_cb));
 
   if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_resolv_cb)))
-    g_resolv_flags |= RESOLV_MAC;
+    gbl_resolv_flags |= RESOLV_MAC;
   else
-    g_resolv_flags &= ~RESOLV_MAC;
+    gbl_resolv_flags &= ~RESOLV_MAC;
   if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(n_resolv_cb)))
-    g_resolv_flags |= RESOLV_NETWORK;
+    gbl_resolv_flags |= RESOLV_NETWORK;
   else
-    g_resolv_flags &= ~RESOLV_NETWORK;
+    gbl_resolv_flags &= ~RESOLV_NETWORK;
   if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(t_resolv_cb)))
-    g_resolv_flags |= RESOLV_TRANSPORT;
+    gbl_resolv_flags |= RESOLV_TRANSPORT;
   else
-    g_resolv_flags &= ~RESOLV_TRANSPORT;
+    gbl_resolv_flags &= ~RESOLV_TRANSPORT;
 
   global_capture_opts.has_ring_num_files =
     gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ringbuffer_nbf_cb));