sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

cifs.upcall: fix compile warning

Browse Source 
Steve French noticed these warnings when building cifs.upcall:

   Compiling client/cifs.upcall.c
   client/cifs.upcall.c: In function 'usage':
   client/cifs.upcall.c:204: warning: declaration of 'prog' shadows a global declaration
   client/cifs.upcall.c:33: warning: shadowed declaration is here

Change the usage function to not take and arg and have it just use the global
"prog" variable. Fix a typo in the log message generated when an unknown
option is specified. Also getopt() always returns '?' when it sees an unknown
option so there's no point in printing it out.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
(This used to be commit 4b8362f977)
This commit is contained in:
Steve French 2008-07-23 14:25:17 -05:00
parent 7014c97aab
commit 224f9b839b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source3/client/cifs.upcall.c
View File

@ -201,7 +201,7 @@ int cifs_resolver(const key_serial_t key, const char *key_descr)
}
void
usage(const char *prog)
usage()
{
syslog(LOG_WARNING, "Usage: %s [-c] [-v] key_serial", prog);
fprintf(stderr, "Usage: %s [-c] [-v] key_serial\n", prog);
@ -234,7 +234,7 @@ int main(const int argc, char *const argv[])
goto out;
}
default:{
syslog(LOG_WARNING, "unknow option: %c", c);
syslog(LOG_WARNING, "unknown option: %c", c);
goto out;
}
}
@ -242,7 +242,7 @@ int main(const int argc, char *const argv[])
/* is there a key? */
if (argc <= optind) {
usage(prog);
usage();
goto out;
}