Clear up the code.

[obnox/wireshark/wip.git] / epan / stat_cmd_args.c

diff --git a/epan/stat_cmd_args.c b/epan/stat_cmd_args.c
index 7499228b46d06fc39216edcf380b56948901107b..07848d4ea2840bad55027d997096c90ddc17f6aa 100644 (file)
--- a/epan/stat_cmd_args.c
+++ b/epan/stat_cmd_args.c
@@ -3,8 +3,8 @@
  *
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  * 
  * This program is free software; you can redistribute it and/or
@@ -39,8 +39,10 @@
  */
 typedef struct _stat_cmd_arg {
        const char *cmd;
-       void (*func)(const char *arg);
+       void (*func)(const char *arg, void* userdata);
+    void* userdata;
 } stat_cmd_arg;
+
 static GSList *stat_cmd_arg_list=NULL;
 
 /* structure to keep track of what stats have been specified on the
@@ -63,13 +65,14 @@ sort_by_name(gconstpointer a, gconstpointer b)
            ((const stat_cmd_arg *)b)->cmd);
 }
 void
-register_stat_cmd_arg(const char *cmd, void (*func)(const char *arg))
+register_stat_cmd_arg(const char *cmd, void (*func)(const char*, void*),void* userdata)
 {
        stat_cmd_arg *newsca;
 
        newsca=g_malloc(sizeof(stat_cmd_arg));
        newsca->cmd=cmd;
        newsca->func=func;
+    newsca->userdata=userdata;
        stat_cmd_arg_list=g_slist_insert_sorted(stat_cmd_arg_list, newsca,
            sort_by_name);
 }
@@ -78,7 +81,7 @@ register_stat_cmd_arg(const char *cmd, void (*func)(const char *arg))
  * Function called for a stat command-line argument
  * ********************************************************************** */
 gboolean
-process_stat_cmd_arg(char *optarg)
+process_stat_cmd_arg(char *optstr)
 {
        GSList *entry;
        stat_cmd_arg *sca;
@@ -86,10 +89,10 @@ process_stat_cmd_arg(char *optarg)
 
        for(entry=stat_cmd_arg_list;entry;entry=g_slist_next(entry)){
                sca=entry->data;
-               if(!strncmp(sca->cmd,optarg,strlen(sca->cmd))){
+               if(!strncmp(sca->cmd,optstr,strlen(sca->cmd))){
                        tr=g_malloc(sizeof (stat_requested));
                        tr->sca = sca;
-                       tr->arg=g_strdup(optarg);
+                       tr->arg=g_strdup(optstr);
                        stats_requested=g_slist_append(stats_requested, tr);
                        return TRUE;
                }
@@ -122,7 +125,7 @@ start_requested_stats(void)
 
        while(stats_requested){
                sr=stats_requested->data;
-               (*sr->sca->func)(sr->arg);
+               (*sr->sca->func)(sr->arg,sr->sca->userdata);
                g_free(sr->arg);
                g_free(sr);
                stats_requested=g_slist_remove(stats_requested, sr);