diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-06-23 20:31:21 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-06-23 20:31:21 +0000 |
| commit | cccc4a85597ab3907d7f24371869a57c386533fa (patch) | |
| tree | b6bfbe3ee0cf9cbd856a7ca4f8eaf10f54fed911 /epan/filesystem.c | |
| parent | 764fa0164b95c4663d1b2bc889736274730153f3 (diff) | |
Rename an argument to avoid collisions with a global variable name, as
noted by John Smith.
Fix indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25547 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/filesystem.c')
| -rw-r--r-- | epan/filesystem.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/filesystem.c b/epan/filesystem.c index 8e60567574..b9fcb2f3bc 100644 --- a/epan/filesystem.c +++ b/epan/filesystem.c @@ -1296,11 +1296,11 @@ get_persconffile_path(const char *filename, gboolean from_profile, gboolean for_ * (move this e.g. to main.c and have set_persconffile_dir() instead in this file?) */ int -filesystem_opt(int opt _U_, const char *optarg) +filesystem_opt(int opt _U_, const char *optstr) { gchar *p, *colonp; - colonp = strchr(optarg, ':'); + colonp = strchr(optstr, ':'); if (colonp == NULL) { return 1; } @@ -1314,7 +1314,7 @@ filesystem_opt(int opt _U_, const char *optarg) * allow it here). */ while (isspace((guchar)*p)) - p++; + p++; if (*p == '\0') { /* * Put the colon back, so if our caller uses, in an @@ -1337,9 +1337,9 @@ filesystem_opt(int opt _U_, const char *optarg) return 1; } - if (strcmp(optarg,"persconf") == 0) { + if (strcmp(optstr,"persconf") == 0) { persconffile_dir = p; - } else if (strcmp(optarg,"persdata") == 0) { + } else if (strcmp(optstr,"persdata") == 0) { persdatafile_dir = p; /* XXX - might need to add the temp file path */ } else { |