- e_addr_resolve is structure so pass it by pointer.

- name_resolve_concurrency must be only defined when used.

svn path=/trunk/; revision=43584

6 files changed, 9 insertions, 7 deletions

diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index e51e4caeff..8806f153b8 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -287,7 +287,9 @@ static void add_serv_port_cb(const guint32 port);
  * Flag controlling what names to resolve.
  */
 e_addr_resolve gbl_resolv_flags = {TRUE, FALSE, TRUE, TRUE};
+#if defined(HAVE_C_ARES) || defined(HAVE_GNU_ADNS)
 static guint name_resolve_concurrency = 500;
+#endif
 
 /*
  *  Global variables (can be changed in GUI sections)
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 34f65f2ccc..80b58c5519 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -916,10 +916,10 @@ void expand_tree_cb(GtkWidget *widget _U_, gpointer data _U_) {
 }
 
 void resolve_name_cb(GtkWidget *widget _U_, gpointer data _U_) {
-    e_addr_resolve resolv_flags = {TRUE, TRUE, TRUE, TRUE};
+    static const e_addr_resolve resolv_flags = {TRUE, TRUE, TRUE, TRUE};
 
     if (cfile.edt->tree) {
-        proto_tree_draw_resolve(cfile.edt->tree, tree_view_gbl, resolv_flags);
+        proto_tree_draw_resolve(cfile.edt->tree, tree_view_gbl, &resolv_flags);
     }
 }
 
diff --git a/ui/gtk/packet_panes.c b/ui/gtk/packet_panes.c
index 84efc4c8b8..d98889e4a2 100644
--- a/ui/gtk/packet_panes.c
+++ b/ui/gtk/packet_panes.c
@@ -2132,7 +2132,7 @@ expand_finfos(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointe
 }
 
 void 
-proto_tree_draw_resolve(proto_tree *protocol_tree, GtkWidget *tree_view, e_addr_resolve resolv)
+proto_tree_draw_resolve(proto_tree *protocol_tree, GtkWidget *tree_view, const e_addr_resolve *resolv)
 {
     ProtoTreeModel *model;
 
diff --git a/ui/gtk/packet_panes.h b/ui/gtk/packet_panes.h
index 839385ec61..65d9f99ce1 100644
--- a/ui/gtk/packet_panes.h
+++ b/ui/gtk/packet_panes.h
@@ -192,7 +192,7 @@ extern GtkWidget * proto_tree_view_new(e_prefs *prefs, GtkWidget **tree_view_p);
  */
 extern void proto_tree_draw(proto_tree *protocol_tree, GtkWidget *tree_view);
 
-extern void proto_tree_draw_resolve(proto_tree *protocol_tree, GtkWidget *tree_view, e_addr_resolve resolv);
+extern void proto_tree_draw_resolve(proto_tree *protocol_tree, GtkWidget *tree_view, const e_addr_resolve *resolv);
 
 /** Expand the whole tree view.
  *
diff --git a/ui/gtk/proto_tree_model.c b/ui/gtk/proto_tree_model.c
index 837948029a..3bef612946 100644
--- a/ui/gtk/proto_tree_model.c
+++ b/ui/gtk/proto_tree_model.c
@@ -455,10 +455,10 @@ proto_tree_model_get_type(void)
 }
 
 void 
-proto_tree_model_force_resolv(ProtoTreeModel *model, e_addr_resolve flags)
+proto_tree_model_force_resolv(ProtoTreeModel *model, const e_addr_resolve *flags)
 {
 	model->resolv_forced = TRUE;
-	model->resolv_flags  = flags;
+	model->resolv_flags  = *flags;
 }
 
 ProtoTreeModel *
diff --git a/ui/gtk/proto_tree_model.h b/ui/gtk/proto_tree_model.h
index bf9fb203b6..b59149a0ee 100644
--- a/ui/gtk/proto_tree_model.h
+++ b/ui/gtk/proto_tree_model.h
@@ -37,6 +37,6 @@ typedef struct proto_tree_model ProtoTreeModel;
 
 GType proto_tree_model_get_type(void);
 ProtoTreeModel *proto_tree_model_new(proto_tree *protocol_tree, int display_hidden_proto_items);
-void proto_tree_model_force_resolv(ProtoTreeModel *model, e_addr_resolve resolv_flags);
+void proto_tree_model_force_resolv(ProtoTreeModel *model, const e_addr_resolve *resolv_flags);
 
 #endif /* __PROTO_TREE_MODEL_H__ */