Avoid calling some free() on WIN32 on memory that may be allocated in

[obnox/wireshark/wip.git] / tap-stats_tree.c

diff --git a/tap-stats_tree.c b/tap-stats_tree.c
index 08845acb84b36e34414bdb166a070591d5e39e05..da4244b0a177872b62004da2d3de1a970fc7c27b 100644 (file)
--- a/tap-stats_tree.c
+++ b/tap-stats_tree.c
@@ -70,7 +70,7 @@ static void draw_stats_tree(void *psp) {
 }
 
 static void  init_stats_tree(const char *optarg,void* userdata _U_) {
-       guint8* abbr = stats_tree_get_abbr((guint8*)optarg);
+       guint8* abbr = stats_tree_get_abbr(optarg);
        GString *error_string;
        stats_tree_cfg *cfg = NULL;
        stats_tree* st = NULL;
@@ -79,8 +79,8 @@ static void  init_stats_tree(const char *optarg,void* userdata _U_) {
                cfg = stats_tree_get_cfg_by_abbr(abbr);
 
                if (cfg != NULL) {
-                       if (strncmp (optarg, (char*)cfg->pr->init_string, strlen((char*)cfg->pr->init_string)) == 0){
-                               st = stats_tree_new(cfg,NULL,(char*)(optarg)+strlen((char*)cfg->pr->init_string));
+                       if (strncmp (optarg, cfg->pr->init_string, strlen(cfg->pr->init_string)) == 0){
+                               st = stats_tree_new(cfg,NULL,(char*)(optarg)+strlen(cfg->pr->init_string));
                        } else {
                                report_failure("Wrong stats_tree (%s) found when looking at ->init_string",abbr);
                                return;
@@ -97,7 +97,7 @@ static void  init_stats_tree(const char *optarg,void* userdata _U_) {
                return;
        }
        
-       error_string = register_tap_listener((char*)st->cfg->tapname,
+       error_string = register_tap_listener(st->cfg->tapname,
                                             st,
                                             st->filter,
                                             stats_tree_reset,
@@ -117,9 +117,9 @@ void register_stats_tree_tap (gpointer k _U_, gpointer v, gpointer p _U_) {
        stats_tree_cfg* cfg = v;
        
        cfg->pr = g_malloc(sizeof(tree_cfg_pres));
-       cfg->pr->init_string = (guint8*)g_strdup_printf("%s,tree",cfg->abbr);
+       cfg->pr->init_string = g_strdup_printf("%s,tree",cfg->abbr);
 
-       register_stat_cmd_arg((char*)cfg->pr->init_string, init_stats_tree, NULL);
+       register_stat_cmd_arg(cfg->pr->init_string, init_stats_tree, NULL);
        
 }