diff options
| author | Steve French <stevef@smf-t60p.smfdom> | 2008-08-16 14:30:16 -0400 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-08-18 15:08:13 +0200 |
| commit | bb75ac0c94fb25c94e6e7911151d00634a39307a (patch) | |
| tree | 719839c596bfb417be93d0ddf5bc8480b7980e42 | |
| parent | edc624788d658d3cfa19f558d1eaff1a77c9a4a8 (diff) | |
| download | samba-bb75ac0c94fb25c94e6e7911151d00634a39307a.tar.gz | |
cifs.upcall: fix compile warning
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>
(cherry picked from commit bd1cf48d7e20cb534bd672bacbf3ac4a87d1a7b4)
| -rw-r--r-- | source/client/cifs.upcall.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/client/cifs.upcall.c b/source/client/cifs.upcall.c index 3860f33e381..e3893260ddc 100644 --- a/source/client/cifs.upcall.c +++ b/source/client/cifs.upcall.c @@ -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; } |