Manually revert r45669

svn path=/trunk/; revision=45884

5 files changed, 4 insertions, 52 deletions

diff --git a/epan/epan.c b/epan/epan.c
index bf1a455b27..657b341988 100644
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -218,20 +218,6 @@ epan_dissect_run_with_taps(epan_dissect_t *edt, struct wtap_pkthdr *phdr,
 }
 
 void
-epan_dissect_reset(epan_dissect_t *edt)
-{
-	/* epan_dissect_cleanup(edt) without freeing tree */
-	g_slist_free(edt->pi.dependent_frames);
-	free_data_sources(&edt->pi);
-	tvb_free_chain(edt->tvb);
-
-	/* epan_dissect_init(edt, create_proto, visible_proto) */
-	edt->pi.dependent_frames = NULL;
-	if (edt->tree)
-		proto_tree_reset(edt->tree);
-}
-
-void
 epan_dissect_cleanup(epan_dissect_t* edt)
 {
 	g_assert(edt);
diff --git a/epan/epan.h b/epan/epan.h
index 122111f7cd..492980b7dd 100644
--- a/epan/epan.h
+++ b/epan/epan.h
@@ -174,10 +174,6 @@ epan_dissect_cleanup(epan_dissect_t* edt);
 void
 epan_dissect_free(epan_dissect_t* edt);
 
-/** reset edt for next packet dissection */
-void
-epan_dissect_reset(epan_dissect_t *edt);
-
 /** Sets custom column */
 const gchar *
 epan_custom_set(epan_dissect_t *edt, int id, gint occurrence,
diff --git a/epan/libwireshark.def b/epan/libwireshark.def
index ffffe1b042..d2be0ef463 100644
--- a/epan/libwireshark.def
+++ b/epan/libwireshark.def
@@ -413,7 +413,6 @@ epan_dissect_new
 epan_dissect_prime_dfilter
 epan_dissect_run
 epan_dissect_run_with_taps
-epan_dissect_reset
 epan_get_compiled_version_info
 epan_get_runtime_version_info
 epan_get_version
diff --git a/epan/proto.c b/epan/proto.c
index bde3fe728c..14a213674f 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -532,8 +532,9 @@ proto_tree_children_foreach(proto_tree *tree, proto_tree_foreach_func func,
 }
 
 static void
-unref_GPtrArray_value(gpointer key, gpointer value _U_, gpointer user_data _U_)
+free_GPtrArray_value(gpointer key, gpointer value, gpointer user_data _U_)
 {
+	GPtrArray         *ptrs = value;
 	gint               hfid = (gint)(long)key;
 	header_field_info *hfinfo;
 
@@ -550,12 +551,6 @@ unref_GPtrArray_value(gpointer key, gpointer value _U_, gpointer user_data _U_)
 		}
 		hfinfo->ref_type = HF_REF_TYPE_NONE;
 	}
-}
-
-static void
-free_GPtrArray_value(gpointer value)
-{
-	GPtrArray *ptrs = value;
 
 	g_ptr_array_free(ptrs, TRUE);
 }
@@ -566,7 +561,7 @@ free_node_tree_data(tree_data_t *tree_data)
 	if (tree_data->interesting_hfids) {
 		/* Free all the GPtrArray's in the interesting_hfids hash. */
 		g_hash_table_foreach(tree_data->interesting_hfids,
-			unref_GPtrArray_value, NULL);
+			free_GPtrArray_value, NULL);
 
 		/* And then destroy the hash. */
 		g_hash_table_destroy(tree_data->interesting_hfids);
@@ -614,28 +609,6 @@ proto_tree_free(proto_tree *tree)
 	free_node_tree_data(tree_data);
 }
 
-void
-proto_tree_reset(proto_tree *tree)
-{
-	tree_data_t *tree_data = PTREE_DATA(tree);
-
-	proto_tree_children_foreach(tree, proto_tree_free_node, NULL);
-
-	/* reset tree */
-	tree->parent = NULL;
-	tree->first_child = NULL;
-	tree->last_child = NULL;
-	tree->next = NULL;
-	PNODE_FINFO(tree) = NULL;
-
-	/* reset tree_data */
-	if (tree_data->interesting_hfids) {
-		g_hash_table_destroy(tree_data->interesting_hfids);
-		tree_data->interesting_hfids = NULL;
-	}
-	tree_data->count = 0;
-}
-
 /* Is the parsing being done for a visible proto_tree or an invisible one?
  * By setting this correctly, the proto_tree creation is sped up by not
  * having to call g_vsnprintf and copy strings around.
@@ -1199,7 +1172,7 @@ proto_lookup_or_create_interesting_hfids(proto_tree *tree,
 		if (PTREE_DATA(tree)->interesting_hfids == NULL) {
 			/* Initialize the hash because we now know that it is needed */
 			PTREE_DATA(tree)->interesting_hfids =
-				g_hash_table_new_full(g_direct_hash, NULL /* g_direct_equal */, NULL, free_GPtrArray_value);
+				g_hash_table_new(g_direct_hash, NULL /* g_direct_equal */);
 		}
 
 		ptrs = g_hash_table_lookup(PTREE_DATA(tree)->interesting_hfids,
diff --git a/epan/proto.h b/epan/proto.h
index dd5e657441..5a2e7bf184 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -701,8 +701,6 @@ extern gboolean proto_item_set_expert_flags(proto_item *ti, const int group, con
  @return the new tree root */
 extern proto_tree* proto_tree_create_root(struct _packet_info *pinfo);
 
-extern void proto_tree_reset(proto_tree *tree);
-
 /** Clear memory for entry proto_tree. Clears proto_tree struct also.
  @param tree the tree to free */
 extern void proto_tree_free(proto_tree *tree);