From: Steve French <stevef@smf-t60p.smfdom>
Date: Wed, 23 Jul 2008 19:25:17 +0000 (-0500)
Subject: cifs.upcall: fix compile warning
X-Git-Tag: samba-3.3.0pre1~411
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b8362f9777debd21c47154e786b7017fbf847f7;p=thirdparty%2Fsamba.git

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

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;
 	}