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

Jeremy Allison jra at samba.org
Mon Sep 15 23:31:15 GMT 2008


The branch, v3-2-test has been updated
       via  d10c386472175ceb312b9bcca07822a6df66a266 (commit)
      from  1b839eb9e4a6312e638d1856d1225b170525da7e (commit)

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


- Log -----------------------------------------------------------------
commit d10c386472175ceb312b9bcca07822a6df66a266
Author: Steven Danneman <steven.danneman at isilon.com>
Date:   Mon Sep 15 16:28:30 2008 -0700

    Fix build warning on FreeBSD
    
    Fix for the following build warning:
    
    Compiling torture/cmd_vfs.c
    torture/cmd_vfs.c: In function `cmd_open':
    torture/cmd_vfs.c:275: warning: unsigned int format, different type arg (arg 3)
    torture/cmd_vfs.c: In function `cmd_mknod':
    torture/cmd_vfs.c:992: warning: unsigned int format, different type arg (arg 3)
    
    sccanf had mismatched types for mode_t between formating parameter and var args.

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

Summary of changes:
 source/torture/cmd_vfs.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/torture/cmd_vfs.c b/source/torture/cmd_vfs.c
index 2840088..dddd5be 100644
--- a/source/torture/cmd_vfs.c
+++ b/source/torture/cmd_vfs.c
@@ -272,7 +272,7 @@ static NTSTATUS cmd_open(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, c
 		flagstr++;
 	}
 	if ((flags & O_CREAT) && argc == 4) {
-		if (sscanf(argv[3], "%o", &mode) == 0) {
+		if (sscanf(argv[3], "%ho", (unsigned short *)&mode) == 0) {
 			printf("open: error=-1 (invalid mode!)\n");
 			return NT_STATUS_UNSUCCESSFUL;
 		}
@@ -989,7 +989,7 @@ static NTSTATUS cmd_mknod(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc,
 		return NT_STATUS_OK;
 	}
 
-	if (sscanf(argv[2], "%o", &mode) == 0) {
+	if (sscanf(argv[2], "%ho", (unsigned short *)&mode) == 0) {
 		printf("open: error=-1 (invalid mode!)\n");
 		return NT_STATUS_UNSUCCESSFUL;
 	}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list