[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  4ac4ad2 s3-utils: fix another -Wunused-but-set-variable build warning.
       via  6a6af31 s3-libsmb: fix build warning of cli_qfilename().
      from  7e56602 s3-build Put memcache in a standalone library

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4ac4ad21084b0cd09261ca37199c2a89607f86eb
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 31 00:35:58 2011 +0200

    s3-utils: fix another -Wunused-but-set-variable build warning.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Tue May 31 05:18:42 CEST 2011 on sn-devel-104

commit 6a6af31148cb6003357ec78a7d9befc9e9313a74
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 31 00:35:11 2011 +0200

    s3-libsmb: fix build warning of cli_qfilename().
    
    Guenther

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

Summary of changes:
 source3/libsmb/clirap.c     |    2 +-
 source3/utils/eventlogadm.c |    3 ---
 2 files changed, 1 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index a05903e..3e5f08d 100644
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -1079,7 +1079,7 @@ NTSTATUS cli_qfilename(struct cli_state *cli, uint16_t fnum, char *name,
 		return status;
 	}
 
-	clistr_pull(rdata, name, rdata+4, namelen, IVAL(rdata, 0),
+	clistr_pull((const char *)rdata, name, rdata+4, namelen, IVAL(rdata, 0),
 		    STR_UNICODE);
 	TALLOC_FREE(rdata);
 	return NT_STATUS_OK;
diff --git a/source3/utils/eventlogadm.c b/source3/utils/eventlogadm.c
index 6ab00ee..a157e91 100644
--- a/source3/utils/eventlogadm.c
+++ b/source3/utils/eventlogadm.c
@@ -365,15 +365,12 @@ static int DoDumpCommand(int argc, char **argv, bool debugflag, char *exename)
 {
 	ELOG_TDB *etdb;
 	TALLOC_CTX *mem_ctx = talloc_tos();
-	const char *tdb_filename;
 	uint32_t count = 1;
 
 	if (argc > 2) {
 		return -1;
 	}
 
-	tdb_filename = argv[0];
-
 	if (argc > 1) {
 		count = atoi(argv[1]);
 	}


-- 
Samba Shared Repository