Rename all stats_tree extern functions to start with stats_tree_

svn path=/trunk/; revision=13840

6 files changed, 95 insertions, 86 deletions

diff --git a/epan/libethereal.def b/epan/libethereal.def
index 0aaafc58f7..162cbcc764 100644
--- a/epan/libethereal.def
+++ b/epan/libethereal.def
@@ -83,10 +83,6 @@ create_dissector_handle
 create_node
 create_node_with_parent_name
 create_persconffile_dir
-create_pivot_node
-create_pivot_node_with_parent_name
-create_range_node
-create_range_node_with_parent_name
 data_out_file                   DATA
 dcerpc_add_conv_to_bind_table
 dcerpc_get_proto_hf_opnum
@@ -329,7 +325,6 @@ isup_message_type_value_acro    DATA
 is_big_endian
 is_tpkt
 LocationRejectReason_vals       DATA
-manip_stat_node
 match_strval
 mkstemp
 mtp3_addr_to_str_buf
@@ -472,7 +467,6 @@ register_giop_user_module
 register_heur_dissector_list
 register_init_routine
 register_postseq_cleanup_routine
-register_stats_tree
 register_tap
 register_tap_listener
 RegistrationRejectReason_vals   DATA
@@ -505,10 +499,29 @@ sid_name_snooping               DATA
 sid_name_table                  DATA
 smb_cmd_vals                    DATA
 sminmpec_values                 DATA
-stat_branch_to_str
-stats_branch_max_name_len
+stats_tree_branch_to_str
+stats_tree_create_node
+stats_tree_create_node_by_pname
+stats_tree_create_pivot
+stats_tree_create_pivot_by_pname
+stats_tree_create_range_node
+stats_tree_free
+stats_tree_get_abbr
+stats_tree_get_cfg_by_abbr
+stats_tree_get_strs_from_node
+stats_tree_manip_node
+stats_tree_new
+stats_tree_node_to_str
 stats_tree_packet
+stats_tree_parent_id_by_name
 stats_tree_presentation
+stats_tree_range_node_with_pname
+stats_tree_register
+stats_tree_reinit
+stats_tree_reset
+stats_tree_tick_pivot
+stats_tree_tick_range
+stats_tree_tick_range_by_pname
 string_to_name_resolve
 T_h323_message_body_vals	DATA
 tap_push_tapped_queue
@@ -517,8 +530,6 @@ tap_queue_packet
 tcp_dissect_pdus
 test_for_directory
 test_for_fifo
-tick_pivot
-tick_range
 time_msecs_to_str
 time_secs_to_str
 trans2_cmd_vals                 DATA
diff --git a/epan/stats_tree.c b/epan/stats_tree.c
index 7a23bfadfd..22251d63cb 100644
--- a/epan/stats_tree.c
+++ b/epan/stats_tree.c
@@ -42,7 +42,7 @@ static GHashTable* registry = NULL;
 
 /* writes into the buffers pointed by value, rate and percent
    the string representations of a node*/
-extern void get_strings_from_node(const stat_node* node, guint8* value, guint8* rate, guint8* percent) {
+extern void stats_tree_get_strs_from_node(const stat_node* node, guint8* value, guint8* rate, guint8* percent) {
 	float f;
 	
 	if (value) g_snprintf(value,NUM_BUF_SIZE,"%u",node->counter);
@@ -67,7 +67,7 @@ extern void get_strings_from_node(const stat_node* node, guint8* value, guint8*
 
 /* a text representation of a node
 if buffer is NULL returns a newly allocated string */
-extern guint8* stat_node_to_str(const stat_node* node,
+extern guint8* stats_tree_node_to_str(const stat_node* node,
 								guint8* buffer, guint len) {
 	if (buffer) {
 		g_snprintf(buffer,len,"%s: %i",node->name, node->counter);
@@ -77,7 +77,7 @@ extern guint8* stat_node_to_str(const stat_node* node,
 	}
 }
 
-extern guint stats_branch_max_name_len(const stat_node* node, guint indent) {
+extern guint stats_tree_branch_max_namelen(const stat_node* node, guint indent) {
 	stat_node* child;
 	guint maxlen = 0;
 	guint len;
@@ -86,7 +86,7 @@ extern guint stats_branch_max_name_len(const stat_node* node, guint indent) {
 
 	if (node->children) {
 		for (child = node->children; child; child = child->next ) {
-			len = stats_branch_max_name_len(child,indent+1); 
+			len = stats_tree_branch_max_namelen(child,indent+1); 
 			maxlen = len > maxlen ? len : maxlen;
 		}
 	}
@@ -101,7 +101,7 @@ static gchar* format;
 
 /* populates the given GString with a tree representation of a branch given by node,
 using indent spaces as initial indentation */
-extern void stat_branch_to_str(const stat_node* node, GString* s, guint indent) {
+extern void stats_tree_branch_to_str(const stat_node* node, GString* s, guint indent) {
 	stat_node* child;
 	static gchar indentation[INDENT_MAX+1];
 	static gchar value[NUM_BUF_SIZE];
@@ -111,10 +111,10 @@ extern void stat_branch_to_str(const stat_node* node, GString* s, guint indent)
 	guint i = 0;
 	
 	if (indent == 0) {
-		format = g_strdup_printf(" %%s%%-%us%%12s   %%12s    %%12s\n",stats_branch_max_name_len(node,0));
+		format = g_strdup_printf(" %%s%%-%us%%12s   %%12s    %%12s\n",stats_tree_branch_max_namelen(node,0));
 	}
 	
-	get_strings_from_node(node, value, rate, percent);
+	stats_tree_get_strs_from_node(node, value, rate, percent);
 	
 	indent = indent > INDENT_MAX ? INDENT_MAX : indent;
 	
@@ -131,7 +131,7 @@ extern void stat_branch_to_str(const stat_node* node, GString* s, guint indent)
 		
 	if (node->children) {
 		for (child = node->children; child; child = child->next ) {
-			stat_branch_to_str(child,s,indent+1);
+			stats_tree_branch_to_str(child,s,indent+1);
 		}
 	}
 	
@@ -166,7 +166,7 @@ static void free_stat_node( stat_node* node ) {
 }
 
 /* destroys the whole tree instance */
-extern void free_stats_tree(stats_tree* st) {
+extern void stats_tree_free(stats_tree* st) {
 	stat_node* child;
 	stat_node* next;
 	
@@ -205,7 +205,7 @@ static void reset_stat_node(stat_node* node) {
 }
 
 /* reset the whole stats_tree */
-extern void reset_stats_tree(void* p) {
+extern void stats_tree_reset(void* p) {
 	stats_tree* st = p;
 	reset_stat_node(&st->root);
 	
@@ -214,7 +214,7 @@ extern void reset_stats_tree(void* p) {
 	}
 }
 
-extern void reinit_stats_tree(void* p) {
+extern void stats_tree_reinit(void* p) {
 	stats_tree* st = p;
 	stat_node* child;
 	stat_node* next;
@@ -234,7 +234,7 @@ extern void reinit_stats_tree(void* p) {
 }
 
 /* register a new stats_tree */
-extern void register_stats_tree(guint8* tapname,
+extern void stats_tree_register(guint8* tapname,
 								guint8* abbr, 
 								guint8* name,
 								stat_tree_packet_cb packet,
@@ -268,7 +268,7 @@ extern void register_stats_tree(guint8* tapname,
 	
 }
 
-extern stats_tree* new_stats_tree(stats_tree_cfg* cfg, tree_pres* pr,char* filter) {
+extern stats_tree* stats_tree_new(stats_tree_cfg* cfg, tree_pres* pr,char* filter) {
 	stats_tree* st = g_malloc(sizeof(stats_tree));
 
 	st->cfg = cfg;
@@ -315,7 +315,7 @@ extern GHashTable* stat_tree_registry(void) {
 	return registry;
 }
 
-extern stats_tree_cfg* get_stats_tree_by_abbr(guint8* abbr) {
+extern stats_tree_cfg* stats_tree_get_cfg_by_abbr(guint8* abbr) {
 	return g_hash_table_lookup(registry,abbr);
 }
 
@@ -437,7 +437,7 @@ static stat_node*  new_stat_node(stats_tree* st,
 }
 /***/
 
-extern int create_node(stats_tree* st, const gchar* name, int parent_id, gboolean with_hash) {
+extern int stats_tree_create_node(stats_tree* st, const gchar* name, int parent_id, gboolean with_hash) {
 	stat_node* node = new_stat_node(st,name,parent_id,with_hash,TRUE);
 	
 	if (node) 
@@ -447,11 +447,11 @@ extern int create_node(stats_tree* st, const gchar* name, int parent_id, gboolea
 }
 
 /* XXX: should this be a macro? */
-extern int create_node_with_parent_name(stats_tree* st,
+extern int stats_tree_create_node_by_pname(stats_tree* st,
 										   const gchar* name,
 										   const gchar* parent_name,
 										   gboolean with_children) {
-	return create_node(st,name,get_parent_id_by_name(st,parent_name),with_children);
+	return stats_tree_create_node(st,name,stats_tree_parent_id_by_name(st,parent_name),with_children);
 }
 
 
@@ -462,7 +462,7 @@ extern int create_node_with_parent_name(stats_tree* st,
  * using parent_name as parent node.
  * with_hash=TRUE to indicate that the created node will have a parent
  */
-extern int manip_stat_node(manip_node_mode mode, stats_tree* st, const guint8* name, int parent_id, gboolean with_hash, gint value) {
+extern int stats_tree_manip_node(manip_node_mode mode, stats_tree* st, const guint8* name, int parent_id, gboolean with_hash, gint value) {
 	stat_node* node = NULL;
 	stat_node* parent = NULL;
 	
@@ -493,7 +493,7 @@ extern int manip_stat_node(manip_node_mode mode, stats_tree* st, const guint8* n
 }
 
 
-extern guint8* get_st_abbr(const guint8* optarg) {
+extern guint8* stats_tree_get_abbr(const guint8* optarg) {
 	guint i;
 
 	/* XXX: this fails when tethereal is given any options
@@ -528,7 +528,7 @@ static range_pair_t* get_range(guint8* rngstr) {
 }
 
 
-extern int create_range_node(stats_tree* st,
+extern int stats_tree_create_range_node(stats_tree* st,
 								const gchar* name,
 								int parent_id,
 								...) {
@@ -548,7 +548,7 @@ extern int create_range_node(stats_tree* st,
 }
 
 /****/
-extern int get_parent_id_by_name(stats_tree* st, const gchar* parent_name) {
+extern int stats_tree_parent_id_by_name(stats_tree* st, const gchar* parent_name) {
 	stat_node* node = g_hash_table_lookup(st->names,parent_name);
 	
 	if (node)
@@ -558,14 +558,14 @@ extern int get_parent_id_by_name(stats_tree* st, const gchar* parent_name) {
 }
 
 
-extern int create_range_node_with_parent_name(stats_tree* st,
+extern int stats_tree_range_node_with_pname(stats_tree* st,
 											  const gchar* name,
 											  const gchar* parent_name,
 											  ...) {
 	va_list list;
 	guint8* curr_range;
 	stat_node* range_node = NULL;
-	int parent_id = get_parent_id_by_name(st,parent_name);
+	int parent_id = stats_tree_parent_id_by_name(st,parent_name);
 	stat_node* rng_root = new_stat_node(st, name, parent_id, FALSE, TRUE);
 
 	va_start( list, parent_name );
@@ -579,7 +579,7 @@ extern int create_range_node_with_parent_name(stats_tree* st,
 }	
 
 
-extern int tick_range(stats_tree* st,
+extern int stats_tree_tick_range(stats_tree* st,
 						 const gchar* name,
 						 int parent_id,
 						 int value_in_range) {
@@ -617,7 +617,7 @@ extern int tick_range(stats_tree* st,
 	return node->id;
 }
 
-extern int create_pivot_node(stats_tree* st,
+extern int stats_tree_create_pivot_node(stats_tree* st,
 							 const gchar* name,
 							 int parent_id) {
 	stat_node* node = new_stat_node(st,name,parent_id,TRUE,TRUE);
@@ -631,7 +631,7 @@ extern int create_pivot_node(stats_tree* st,
 extern int create_pivot_node_with_parent_name(stats_tree* st,
 							 const gchar* name,
 							 const gchar* parent_name) {
-	int parent_id = get_parent_id_by_name(st,parent_name);
+	int parent_id = stats_tree_parent_id_by_name(st,parent_name);
 	stat_node* node;
 	
 	node = new_stat_node(st,name,parent_id,TRUE,TRUE);
@@ -642,14 +642,14 @@ extern int create_pivot_node_with_parent_name(stats_tree* st,
 		return 0;
 }
 
-extern int tick_pivot(stats_tree* st,
+extern int stats_tree_tick_pivot(stats_tree* st,
 					  int pivot_id,
 					  const gchar* pivot_value) {
 	
 	stat_node* parent = g_ptr_array_index(st->parents,pivot_id);
 	
 	parent->counter++;
-	manip_stat_node( MN_INCREASE, st, pivot_value, pivot_id, FALSE, 1);
+	stats_tree_manip_node( MN_INCREASE, st, pivot_value, pivot_id, FALSE, 1);
 	
 	return pivot_id;
 }
diff --git a/epan/stats_tree.h b/epan/stats_tree.h
index a89669f3be..2adf2d153f 100644
--- a/epan/stats_tree.h
+++ b/epan/stats_tree.h
@@ -52,13 +52,13 @@ typedef void  (*stat_tree_init_cb)(stats_tree*);
  * packet: per packet callback
  * init: tree initialization callback
  */
-extern void register_stats_tree(guint8* tapname,
+extern void stats_tree_register(guint8* tapname,
 								guint8* abbr, 
 								guint8* name,
 								stat_tree_packet_cb packet,
 								stat_tree_init_cb init );
 
-extern int get_parent_id_by_name(stats_tree* st, const gchar* parent_name);
+extern int stats_tree_parent_id_by_name(stats_tree* st, const gchar* parent_name);
 
 /* Creates a node in the tree (to be used in the in init_cb)
 * st: the stats_tree in which to create it
@@ -66,50 +66,51 @@ extern int get_parent_id_by_name(stats_tree* st, const gchar* parent_name);
 * parent_name: the name of the parent_node (NULL for root)
 * with_children: TRUE if this node will have "dynamically created" children
 */
-extern int create_node(stats_tree* st,
+extern int stats_tree_create_node(stats_tree* st,
 						const gchar* name,
 						int parent_id,
 						gboolean with_children);
 
-extern int create_node_with_parent_name(stats_tree* st,
+/* creates a node using it's parent's tree name */ 
+extern int stats_tree_create_node_by_pname(stats_tree* st,
 						  const gchar* name,
 						  const gchar* parent_name,
 						  gboolean with_children);
 
 /* creates a node in the tree, that will contain a ranges list.
  example:
- create_range_node(st,name,parent,
+ stats_tree_create_range_node(st,name,parent,
 				   "-99","100-199","200-299","300-399","400-", NULL);
 */
-extern int create_range_node(stats_tree* st,
+extern int stats_tree_create_range_node(stats_tree* st,
 								const gchar* name,
 								int parent_id,
 								...);
 
-extern int create_range_node_with_parent_name(stats_tree* st,
+extern int stats_tree_range_node_with_pname(stats_tree* st,
 											  const gchar* name,
 											  const gchar* parent_name,
 											  ...);
-/* */
 
-extern int tick_range(stats_tree* st,
-						 const gchar* name,
-						 int parent_id,
-						 int value_in_range);
+/* increases by one the ranged node and the sub node to whose range the value belongs */
+extern int stats_tree_tick_range(stats_tree* st,
+								 const gchar* name,
+								 int parent_id,
+								 int value_in_range);
 
-#define tick_range_with_parent_name(st,name,parent_name,value_in_range) \
-     tick_range((st),(name),get_parent_id_by_name((st),(parent_name),(value_in_range))
+#define stats_tree_tick_range_by_pname(st,name,parent_name,value_in_range) \
+     stats_tree_tick_range((st),(name),stats_tree_parent_id_by_name((st),(parent_name),(value_in_range))
 
 /* */
-extern int create_pivot_node(stats_tree* st,
+extern int stats_tree_create_pivot(stats_tree* st,
 							 const gchar* name,
 							 int parent_id);
 
-extern int create_pivot_node_with_parent_name(stats_tree* st,
+extern int stats_tree_create_pivot_by_pname(stats_tree* st,
 											  const gchar* name,
 											  const gchar* parent_name);
 
-extern int tick_pivot(stats_tree* st,
+extern int stats_tree_tick_pivot(stats_tree* st,
 					  int pivot_id,
 					  const gchar* pivot_value);
 
@@ -120,7 +121,7 @@ extern int tick_pivot(stats_tree* st,
  * with_children=TRUE to indicate that the created node will be a parent
  */
 typedef enum _manip_node_mode { MN_INCREASE, MN_SET } manip_node_mode;
-extern int manip_stat_node(manip_node_mode mode,
+extern int stats_tree_manip_node(manip_node_mode mode,
 							   stats_tree* st,
 							   const guint8* name,
 							   int parent_id,
@@ -128,15 +129,15 @@ extern int manip_stat_node(manip_node_mode mode,
 							   gint value);
 
 #define increase_stat_node(st,name,parent_id,with_children,value) \
-(manip_stat_node(MN_INCREASE,(st),(name),(parent_id),(with_children),(value)))
+(stats_tree_manip_node(MN_INCREASE,(st),(name),(parent_id),(with_children),(value)))
 
 #define tick_stat_node(st,name,parent_id,with_children) \
-(manip_stat_node(MN_INCREASE,(st),(name),(parent_id),(with_children),1))
+(stats_tree_manip_node(MN_INCREASE,(st),(name),(parent_id),(with_children),1))
 
 #define set_stat_node(st,name,parent_id,with_children,value) \
-(manip_stat_node(MN_SET,(st),(name),(parent_id),(with_children),value))
+(stats_tree_manip_node(MN_SET,(st),(name),(parent_id),(with_children),value))
 
 #define zero_stat_node(st,name,parent_id,with_children) \
-(manip_stat_node(MN_SET,(st),(name),(parent_id),(with_children),0))
+(stats_tree_manip_node(MN_SET,(st),(name),(parent_id),(with_children),0))
 
 #endif /* __STATS_TREE_H */
diff --git a/epan/stats_tree_priv.h b/epan/stats_tree_priv.h
index 078d343a60..0091302f4d 100644
--- a/epan/stats_tree_priv.h
+++ b/epan/stats_tree_priv.h
@@ -155,50 +155,47 @@ extern void stats_tree_presentation(void (*registry_iterator)(gpointer,gpointer,
 									void (*reset_tree)(stats_tree*),
 									void* data);
 
-extern stats_tree* new_stats_tree(stats_tree_cfg* cfg, tree_pres* pr, char* filter);
+extern stats_tree* stats_tree_new(stats_tree_cfg* cfg, tree_pres* pr, char* filter);
 
 /* callback for taps */
 extern int  stats_tree_packet(void*, packet_info*, epan_dissect_t*, const void *);
 
 /* callback for reset */
-extern void reset_stats_tree(void* p_st);
+extern void stats_tree_reset(void* p_st);
 
 /* callback for clear */
-extern void reinit_stats_tree(void* p_st);
+extern void stats_tree_reinit(void* p_st);
 
 /* callback for destoy */
-extern void free_stats_tree(stats_tree* st);
+extern void stats_tree_free(stats_tree* st);
 
 /* given an optarg splits the abbr part
    and returns a newly allocated buffer containing it */
-extern guint8* get_st_abbr(const guint8* optarg);
+extern guint8* stats_tree_get_abbr(const guint8* optarg);
 
 /* obtains a stats tree from the registry given its abbr */
-extern stats_tree_cfg* get_stats_tree_by_abbr(guint8* abbr);
+extern stats_tree_cfg* stats_tree_get_cfg_by_abbr(guint8* abbr);
 
 /* extracts node data as strings from a stat_node into
    the buffers given by value, rate and precent
    if NULL they are ignored */
-extern void get_strings_from_node(const stat_node* node,
+extern void stats_tree_get_strs_from_node(const stat_node* node,
 								  guint8* value,
 								  guint8* rate,
 								  guint8* percent);
 
 /* populates the given GString with a tree representation of a branch given by node,
    using indent spaces as indentation */
-extern void stat_branch_to_str(const stat_node* node,
+extern void stats_tree_branch_to_str(const stat_node* node,
 							   GString* s,
 							   guint indent);
 
 /* used to calcuate the size of the indentation and the longest string */
-extern guint stats_branch_max_name_len(const stat_node* node, guint indent);
+extern guint stats_tree_branch_max_namelen(const stat_node* node, guint indent);
 
 /* a text representation of a node,
    if buffer is NULL returns a newly allocated string */
-extern guint8* stat_node_to_str(const stat_node* node,
+extern guint8* stats_tree_node_to_str(const stat_node* node,
 								guint8* buffer, guint len);
 
-/* destroys the stats_tree */
-extern void free_stats_tree(stats_tree* st);
-
 #endif /* __STATS_TREE_PRIV_H */
diff --git a/gtk/stats_tree_stat.c b/gtk/stats_tree_stat.c
index 2a5c659890..2573b229e3 100644
--- a/gtk/stats_tree_stat.c
+++ b/gtk/stats_tree_stat.c
@@ -131,7 +131,7 @@ static void draw_gtk_node(stat_node* node) {
 	static gchar percent[NUM_BUF_SIZE];
 	stat_node* child;
 	
-	get_strings_from_node(node, value, rate, percent);
+	stats_tree_get_strs_from_node(node, value, rate, percent);
 	
 #if GTK_MAJOR_VERSION >= 2
 	if (node->st->pr->store) {
@@ -190,14 +190,14 @@ static void free_gtk_tree(GtkWindow *win _U_, stats_tree *st)
 		st->root.pr->iter = NULL;
 #endif
 	
-	free_stats_tree(st);
+	stats_tree_free(st);
 	
 }
 
 
 /* initializes the stats_tree window */
 static void init_gtk_tree(char* optarg) {
-	guint8* abbr = get_st_abbr(optarg);
+	guint8* abbr = stats_tree_get_abbr(optarg);
 	stats_tree* st = NULL;
 	stats_tree_cfg* cfg = NULL;
 	tree_pres* pr = g_malloc(sizeof(tree_pres));
@@ -221,20 +221,20 @@ static void init_gtk_tree(char* optarg) {
 #endif
 	
 	if (abbr) {
-		cfg = get_stats_tree_by_abbr(abbr);
+		cfg = stats_tree_get_cfg_by_abbr(abbr);
 		
 		if (cfg != NULL) {
 			init_strlen = strlen(cfg->pr->stat_dlg->init_string);
 			
 			if (strncmp (optarg, cfg->pr->stat_dlg->init_string, init_strlen) == 0){
 				if (init_strlen == strlen(optarg)) {
-					st = new_stats_tree(cfg,pr,NULL);
+					st = stats_tree_new(cfg,pr,NULL);
 				} else { 
-					st = new_stats_tree(cfg,pr,((guint8*)optarg)+init_strlen+1);
+					st = stats_tree_new(cfg,pr,((guint8*)optarg)+init_strlen+1);
 				}
 				
 			} else {
-				st = new_stats_tree(cfg,pr,NULL);
+				st = stats_tree_new(cfg,pr,NULL);
 			}
 		} else {
 			g_error("no such stats_tree (%s) found in stats_tree registry",abbr);
diff --git a/tap-stats_tree.c b/tap-stats_tree.c
index 4c0f3a1925..1cf1a4fe42 100644
--- a/tap-stats_tree.c
+++ b/tap-stats_tree.c
@@ -52,13 +52,13 @@ static void draw_stats_tree(void *psp) {
 	stat_node* child;
 	
 	s = g_string_new("\n===================================================================\n");
-	fmt = g_strdup_printf(" %%s%%-%us%%12s\t%%12s\t%%12s\n",stats_branch_max_name_len(&st->root,0));
+	fmt = g_strdup_printf(" %%s%%-%us%%12s\t%%12s\t%%12s\n",stats_tree_branch_max_namelen(&st->root,0));
 	g_string_sprintfa(s,fmt,"",st->cfg->name,"value","rate","percent");
 	g_free(fmt);
 	g_string_sprintfa(s,"-------------------------------------------------------------------\n");
 	
 	for (child = st->root.children; child; child = child->next ) {
-		stat_branch_to_str(child,s,0);
+		stats_tree_branch_to_str(child,s,0);
 	}
 	
 	s = g_string_append(s,"\n===================================================================\n");
@@ -68,17 +68,17 @@ static void draw_stats_tree(void *psp) {
 }
 
 static void  init_stats_tree(char *optarg) {
-	guint8* abbr = get_st_abbr(optarg);
+	guint8* abbr = stats_tree_get_abbr(optarg);
 	GString	*error_string;
 	stats_tree_cfg *cfg = NULL;
 	stats_tree* st = NULL;
 	
 	if (abbr) {
-		cfg = get_stats_tree_by_abbr(abbr);
+		cfg = stats_tree_get_cfg_by_abbr(abbr);
 
 		if (cfg != NULL) {
 			if (strncmp (optarg, cfg->pr->init_string, strlen(cfg->pr->init_string)) == 0){
-				st = new_stats_tree(cfg,NULL,((guint8*)optarg)+strlen(cfg->pr->init_string));
+				st = stats_tree_new(cfg,NULL,((guint8*)optarg)+strlen(cfg->pr->init_string));
 			} else {
 				st->filter=NULL;
 			}
@@ -95,7 +95,7 @@ static void  init_stats_tree(char *optarg) {
 	error_string = register_tap_listener( st->cfg->tapname,
 										  st,
 										  st->filter,
-										  reset_stats_tree,
+										  stats_tree_reset,
 										  stats_tree_packet,
 										  draw_stats_tree);