osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Clean up stats_tree_presentation. 

Remove some unused struct members and accompanying callbacks.

Change-Id: I64d32ddf886038e8f19bc3f88e86c8d7578db648
Reviewed-on: https://code.wireshark.org/review/8779
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2015-06-05 13:44:42 -07:00
parent ab6108cbdf
commit 1736a1bcc6
5 changed files with 5 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
epan/stats_tree.c
View File

@ -117,8 +117,6 @@ free_stat_node(stat_node *node)
}
}
if(node->st->cfg->free_node_pr) node->st->cfg->free_node_pr(node);
if (node->hash) g_hash_table_destroy(node->hash);
while (node->bh) {
@ -188,11 +186,6 @@ reset_stat_node(stat_node *node)
for (child = node->children; child; child = child->next )
reset_stat_node(child);
}
if(node->st->cfg->reset_node) {
node->st->cfg->reset_node(node);
}
}
/* reset the whole stats_tree */
@ -206,10 +199,6 @@ stats_tree_reset(void *p)
st->now = - 1.0;
reset_stat_node(&st->root);
if (st->cfg->reset_tree) {
st->cfg->reset_tree(st);
}
}
extern void
@ -386,13 +375,7 @@ stats_tree_get_cfg_list(void)
struct _stats_tree_pres_cbs {
void (*setup_node_pr)(stat_node*);
void (*free_node_pr)(stat_node*);
void (*draw_node)(stat_node*);
void (*reset_node)(stat_node*);
tree_pres *(*new_tree_pr)(stats_tree*);
void (*free_tree_pr)(stats_tree*);
void (*draw_tree)(stats_tree*);
void (*reset_tree)(stats_tree*);
};
static void
@ -403,38 +386,20 @@ setup_tree_presentation(gpointer k _U_, gpointer v, gpointer p)
cfg->in_use = FALSE;
cfg->setup_node_pr = d->setup_node_pr;
cfg->new_tree_pr = d->new_tree_pr;
cfg->free_node_pr = d->free_node_pr;
cfg->free_tree_pr = d->free_tree_pr;
cfg->draw_node = d->draw_node;
cfg->draw_tree = d->draw_tree;
cfg->reset_node = d->reset_node;
cfg->reset_tree = d->reset_tree;
}
extern void
stats_tree_presentation(void (*registry_iterator)(gpointer,gpointer,gpointer),
void (*setup_node_pr)(stat_node*),
void (*free_node_pr)(stat_node*),
void (*draw_node)(stat_node*),
void (*reset_node)(stat_node*),
tree_pres *(*new_tree_pr)(stats_tree*),
void (*free_tree_pr)(stats_tree*),
void (*draw_tree)(stats_tree*),
void (*reset_tree)(stats_tree*),
void *data)
{
static struct _stats_tree_pres_cbs d;
d.setup_node_pr = setup_node_pr;
d.new_tree_pr = new_tree_pr;
d.free_node_pr = free_node_pr;
d.free_tree_pr = free_tree_pr;
d.draw_node = draw_node;
d.draw_tree = draw_tree;
d.reset_node = reset_node;
d.reset_tree = reset_tree;
if (registry) g_hash_table_foreach(registry,setup_tree_presentation,&d);

17
epan/stats_tree_priv.h
View File

@ -140,7 +140,7 @@ struct _stats_tree_cfg {
gchar* tapname;
register_stat_group_t stat_group;
gboolean in_use; /* GTK+ only */
gboolean in_use; /* GTK+ only */
gboolean plugin;
/** dissector defined callbacks */
@ -158,13 +158,6 @@ struct _stats_tree_cfg {
/** last to be called at node creation */
void (*setup_node_pr)(stat_node*);
/** last to be called at node destruction */
void (*free_node_pr)(stat_node*);
/** to be called for every node in the tree */
void (*draw_node)(stat_node*);
void (*reset_node)(stat_node*);
/**
* tree presentation callbacks
*/
@ -173,8 +166,6 @@ struct _stats_tree_cfg {
tree_pres *(*new_tree_pr)(stats_tree*);
void (*free_tree_pr)(stats_tree*);
void (*draw_tree)(stats_tree*);
void (*reset_tree)(stats_tree*);
/** flags for the stats tree (sorting etc.) default values to new trees */
guint st_flags;
@ -183,13 +174,7 @@ struct _stats_tree_cfg {
/* guess what, this is it! */
WS_DLL_PUBLIC void stats_tree_presentation(void (*registry_iterator)(gpointer,gpointer,gpointer),
void (*setup_node_pr)(stat_node*),
void (*free_node_pr)(stat_node*),
void (*draw_node)(stat_node*),
void (*reset_node)(stat_node*),
tree_pres *(*new_tree_pr)(stats_tree*),
void (*free_tree_pr)(stats_tree*),
void (*draw_tree)(stats_tree*),
void (*reset_tree)(stats_tree*),
void *data);
WS_DLL_PUBLIC stats_tree *stats_tree_new(stats_tree_cfg *cfg, tree_pres *pr, const char *filter);

4
ui/cli/tap-stats_tree.c
View File

@ -136,8 +136,8 @@ free_tree_presentation(stats_tree *st)
void
register_tap_listener_stats_tree_stat(void)
{
stats_tree_presentation(register_stats_tree_tap, NULL, NULL, NULL, NULL,
NULL, free_tree_presentation, NULL, NULL, NULL);
stats_tree_presentation(register_stats_tree_tap, NULL,
free_tree_presentation, NULL);
}
/*

11
ui/gtk/stats_tree_stat.c
View File

@ -569,17 +569,8 @@ free_tree_presentation(stats_tree* st)
void
register_tap_listener_stats_tree_stat(void)
{
stats_tree_presentation(register_gtk_stats_tree_tap,
NULL,
NULL,
NULL,
NULL,
NULL,
free_tree_presentation,
NULL,
NULL,
NULL);
NULL, free_tree_presentation, NULL);
}
void gtk_stats_tree_cb(GtkAction *action, gpointer user_data _U_)

9
ui/qt/stats_tree_dialog.cpp
View File

@ -328,14 +328,7 @@ register_tap_listener_stats_tree_stat(void)
{
stats_tree_presentation(NULL,
StatsTreeDialog::setupNode,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL);
NULL, NULL);
}
}