From 256552f6a39c248666257c5cdea4718460d5e342 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 23 Jun 2008 20:31:21 +0000 Subject: [PATCH] Rename an argument to avoid collisions with a global variable name, as noted by John Smith. Fix indentation. svn path=/trunk/; revision=25547 --- epan/filesystem.c | 10 +++++----- epan/filesystem.h | 2 +- 2 files changed, 6 insertions(+), 6 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 { diff --git a/epan/filesystem.h b/epan/filesystem.h index 9f7de24b90..a332735d15 100644 --- 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