osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Rename an argument to avoid collisions with a global variable name, as 

noted by John Smith.

Fix indentation.

svn path=/trunk/; revision=25547
This commit is contained in:
Guy Harris 2008-06-23 20:31:21 +00:00
parent 0b1a0718ce
commit 256552f6a3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
epan/filesystem.c
View File

@ -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 {

2
epan/filesystem.h
View File

@ -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