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

diff --git a/epan/filesystem.c b/epan/filesystem.c
index 8e60567574ad844d4d7556e084076fdcc25b76f3..b9fcb2f3bc20836975fc3ffdc82c9c018c92527d 100644 (file)
--- 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 {

diff --git a/epan/filesystem.h b/epan/filesystem.h
index 9f7de24b9019d55e404d6a88872a98fd7f690495..a332735d15e509ca9038324baef8c3558ae2ba90 100644 (file)
--- a/epan/filesystem.h
+++ b/epan/filesystem.h
@@ -173,7 +173,7 @@ extern char *get_tempfile_path(const char *filename);
 /* 
  * process command line option belonging to the filesystem settings
  */
-extern int filesystem_opt(int opt, const char *optarg);
+extern int filesystem_opt(int opt, const char *optstr);
 
 /*
  * Return an error message for UNIX-style errno indications on open or