Um, no, the problem with the Leopard x86 build is that we first do a
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 14 May 2010 00:49:28 +0000 (00:49 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 14 May 2010 00:49:28 +0000 (00:49 +0000)
build without libpcap, to make sure that works, and then do a build with
libpcap, to put into a binary release.  It's the former that's failing;
I'll back out the previous change and then work on that.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32801 f5534014-38df-0310-8fa8-9805f1628bb7

capture-pcap-util.c
capture_ifinfo.c
capture_ifinfo.h
capture_opts.c
capture_opts.h
dumpcap.c
gtk/capture_dlg.c
gtk/main.c
gtk/prefs_capture.c
tshark.c

index 55378d7b83a13d96f6d759fb218b9a2101863408..1850b10acd203f3b93d4251e61b5aa2ad9ec39ce 100644 (file)
@@ -448,7 +448,7 @@ free_linktype_cb(gpointer data, gpointer user_data _U_)
 }
 
 void
-free_if_capabilities(if_caps_t *caps)
+free_if_capabilities(if_capabilities_t *caps)
 {
        g_list_foreach(caps->data_link_types, free_linktype_cb, NULL);
        g_list_free(caps->data_link_types);
index b5b888959922d1be66498350d2717445e2e5e153..e9fc5347a0263c26e4e64e9b6e9b5dfc792100b3 100644 (file)
@@ -155,11 +155,11 @@ capture_interface_list(int *err, char **err_str)
 
 /* XXX - We parse simple text output to get our interface list.  Should
  * we use "real" data serialization instead, e.g. via XML? */
-if_caps_t *
+if_capabilities_t *
 capture_get_if_capabilities(const gchar *ifname, gboolean monitor_mode,
                             char **err_str)
 {
-    if_caps_t *caps;
+    if_capabilities_t *caps;
     GList              *linktype_list = NULL;
     int                 err, i;
     gchar              *msg;
index ba97650744361f68abe825f9743f379467c9577e..e0cec1db7f0ebbd940a907e24dd85c733ad6c612 100644 (file)
@@ -74,7 +74,7 @@ void free_interface_list(GList *if_list);
 typedef struct {
        gboolean        can_set_rfmon;  /* TRUE if can be put into monitor mode */
        GList           *data_link_types;       /* GList of data_link_info_t's */
-} if_caps_t;
+} if_capabilities_t;
 
 /*
  * Information about data link types.
@@ -88,11 +88,11 @@ typedef struct {
 /**
  * Fetch the linktype list for the specified interface from a child process.
  */
-extern if_caps_t *
+extern if_capabilities_t *
 capture_get_if_capabilities(const char *devname, gboolean monitor_mode,
                             char **err_str);
 
-void free_if_capabilities(if_caps_t *caps);
+void free_if_capabilities(if_capabilities_t *caps);
 
 #endif /* HAVE_LIBPCAP */
 
index e42ebf842d4e7afd72ef8157c40492777f5fe65a..23297b60eb7d7b083bc2e4b74a06d6d6f71d59d3 100644 (file)
@@ -547,7 +547,7 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg_
 }
 
 void
-capture_opts_print_if_capabilities(if_caps_t *caps,
+capture_opts_print_if_capabilities(if_capabilities_t *caps,
                                    gboolean monitor_mode)
 {
     GList *lt_entry;
index 4023dad9f22ba7b77b5fc1af3e65b63a576d15cd..34709fce04e816f706ea9f8099a467ee93555fc2 100644 (file)
@@ -176,7 +176,7 @@ capture_opts_log(const char *log_domain, GLogLevelFlags log_level, capture_optio
 
 /* print interface capabilities, including link layer types */
 extern void
-capture_opts_print_if_capabilities(if_caps_t *caps,
+capture_opts_print_if_capabilities(if_capabilities_t *caps,
                                    gboolean monitor_mode);
 
 /* print list of interfaces */
index c5af5cc12827c055c9b8aba8e3b5b0cb777e740e..ef865b97e73b98e0288136c8a988eb3710585490 100644 (file)
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -502,14 +502,14 @@ create_data_link_info(int dlt)
     return data_link_info;
 }
 
-static if_caps_t *
+static if_capabilities_t *
 get_if_capabilities(const char *devname, gboolean monitor_mode
 #ifndef HAVE_PCAP_CREATE
        _U_
 #endif
 , char **err_str)
 {
-    if_caps_t *caps;
+    if_capabilities_t *caps;
     char errbuf[PCAP_ERRBUF_SIZE];
     pcap_t *pch;
 #ifdef HAVE_PCAP_CREATE
@@ -741,7 +741,7 @@ print_machine_readable_interfaces(GList *if_list)
  * you MUST update capture_ifinfo.c:capture_get_if_capabilities() accordingly!
  */
 static void
-print_machine_readable_if_capabilities(if_caps_t *caps)
+print_machine_readable_if_capabilities(if_capabilities_t *caps)
 {
     GList *lt_entry;
     data_link_info_t *data_link_info;
@@ -3472,7 +3472,7 @@ main(int argc, char *argv[])
     exit_main(0);
   } else if (list_link_layer_types) {
     /* Get the list of link-layer types for the capture device. */
-    if_caps_t *caps;
+    if_capabilities_t *caps;
     gchar *err_str;
 
     caps = get_if_capabilities(global_capture_opts.iface,
index 4405dd148cc55b894ccbc89481665cb5ed9a4ec9..405cd173e183668e86d85ffdd8656f51b45ca8ef 100644 (file)
@@ -252,7 +252,7 @@ set_link_type_list(GtkWidget *linktype_om, GtkWidget *entry)
   GList *if_list;
   GList *if_entry;
   if_info_t *if_info;
-  if_caps_t *caps;
+  if_capabilities_t *caps;
   int err;
   GtkWidget *lt_menu, *lt_menu_item;
   GList *lt_entry;
index c48c5fe39489d0f518b1175e8689e7ebb9539cc4..b5c82a7c5ec8686d88f2e84302de0bfa6530a019 100644 (file)
@@ -2741,7 +2741,7 @@ main(int argc, char *argv[])
 
   if (list_link_layer_types) {
     /* Get the list of link-layer types for the capture device. */
-    if_caps_t *caps;
+    if_capabilities_t *caps;
 
     caps = capture_get_if_capabilities(global_capture_opts.iface,
                                        global_capture_opts.monitor_mode,
index 8114a8113d494f4b36cec96c643487fd2aa3f6f4..6debfe3ae985d5c8bb3ebc357ab38cac3a9b079c 100644 (file)
@@ -598,7 +598,7 @@ ifopts_edit_destroy_cb(GtkWidget *win, gpointer data _U_)
 static gint
 ifopts_description_to_val (const char *if_name, const char *descr) 
 {
-       if_caps_t *caps;
+       if_capabilities_t *caps;
        int dlt = -1;
 
        caps = capture_get_if_capabilities(if_name, FALSE, NULL);
@@ -640,7 +640,7 @@ ifopts_edit_ifsel_cb(GtkTreeSelection       *selection _U_,
        gchar              *desc, *comment, *text;
        gchar              *if_name, *linktype;
        gboolean            hide;
-       if_caps_t *caps;
+       if_capabilities_t *caps;
        gint                selected = 0;
 
        /* Get list_store data for currently selected interface */
@@ -841,7 +841,7 @@ ifopts_options_add(GtkListStore *list_store, if_info_t *if_info)
        gchar   *desc;
        gchar   *pr_descr;
        gchar   *text[] = { NULL, NULL, NULL, NULL };
-       if_caps_t *caps;
+       if_capabilities_t *caps;
        gint     linktype;
        gboolean hide;
        GtkTreeIter  iter;
index 37f544b754f4808fb0b3dec8f51452d7ddb40354..46d211377de0aec6fa66f4dd6769686262487c63 100644 (file)
--- a/tshark.c
+++ b/tshark.c
@@ -1640,7 +1640,7 @@ main(int argc, char *argv[])
     /* if requested, list the link layer types and exit */
     if (list_link_layer_types) {
         /* Get the list of link-layer types for the capture device. */
-        if_caps_t *caps;
+        if_capabilities_t *caps;
 
         caps = capture_get_if_capabilities(global_capture_opts.iface,
                                            global_capture_opts.monitor_mode,