diff options
| author | Guy Harris <guy@alum.mit.edu> | 2008-06-23 21:31:10 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2008-06-23 21:31:10 +0000 |
| commit | bb3ac49c2d8fa6c7a1f08bdea19498ab6b94b160 (patch) | |
| tree | 548be85bf7ff181257cacb1b64671e5f3c4b0cc1 | |
| parent | 29adf5399a1a4d9294c5fe1e2ac876bed7e64219 (diff) | |
Rename an argument to avoid colliding with a global variable.
svn path=/trunk/; revision=25559
| -rw-r--r-- | epan/stat_cmd_args.c | 6 | ||||
| -rw-r--r-- | epan/stat_cmd_args.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/epan/stat_cmd_args.c b/epan/stat_cmd_args.c index 8ab4a5ddd9..07848d4ea2 100644 --- a/epan/stat_cmd_args.c +++ b/epan/stat_cmd_args.c @@ -81,7 +81,7 @@ register_stat_cmd_arg(const char *cmd, void (*func)(const char*, void*),void* us * 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; @@ -89,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; } diff --git a/epan/stat_cmd_args.h b/epan/stat_cmd_args.h index 863f405add..cc8ea68bc2 100644 --- a/epan/stat_cmd_args.h +++ b/epan/stat_cmd_args.h @@ -28,7 +28,7 @@ extern void register_stat_cmd_arg(const char *cmd, void (*func)(const char *arg,void* userdata), void* userdata); -extern gboolean process_stat_cmd_arg(char *optarg); +extern gboolean process_stat_cmd_arg(char *optstr); extern void list_stat_cmd_args(void); extern void start_requested_stats(void); |