[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3395-g4b8362f

[sfrench at samba.org]

The branch, v3-3-test has been updated
       via  4b8362f9777debd21c47154e786b7017fbf847f7 (commit)
      from  5ab391d466ce9ddea31f6f6bf467aa6c5f3a7efb (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 4b8362f9777debd21c47154e786b7017fbf847f7
Author: Steve French <stevef at smf-t60p.smfdom>
Date:   Wed Jul 23 14:25:17 2008 -0500

    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 at redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 source/client/cifs.upcall.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/client/cifs.upcall.c b/source/client/cifs.upcall.c
index 3860f33..e389326 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;
 	}
 


-- 
Samba Shared Repository