[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Thu Sep 9 03:10:09 MDT 2010


The branch, master has been updated
       via  a4d23ed lib/util: remove some unused_result warnings.
       via  f1aa9eb s3-utils: remove unused variable in smbget.
      from  eedf476 s3: Remove "mem_ctx" from a few functions

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


- Log -----------------------------------------------------------------
commit a4d23ed66ff32b5a9dc00ea82036436df0e97505
Author: Günther Deschner <gd at samba.org>
Date:   Thu Sep 9 11:10:01 2010 +0200

    lib/util: remove some unused_result warnings.
    
    Guenther

commit f1aa9ebb08d617f4eeeebed70af202764f40ee90
Author: Günther Deschner <gd at samba.org>
Date:   Thu Sep 9 11:09:35 2010 +0200

    s3-utils: remove unused variable in smbget.
    
    Guenther

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

Summary of changes:
 lib/util/util.c        |    9 +++++++--
 source3/utils/smbget.c |    1 -
 2 files changed, 7 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/util.c b/lib/util/util.c
index c0af4b0..076ddf4 100644
--- a/lib/util/util.c
+++ b/lib/util/util.c
@@ -899,8 +899,13 @@ void *allocate_anonymous_shared(size_t bufsz)
 void samba_start_debugger(void)
 {
 	char *cmd = NULL;
-	asprintf(&cmd, "xterm -e \"gdb --pid %u\"&", getpid());
-	system(cmd);
+	if (asprintf(&cmd, "xterm -e \"gdb --pid %u\"&", getpid()) == -1) {
+		return;
+	}
+	if (system(cmd) == -1) {
+		free(cmd);
+		return;
+	}
 	free(cmd);
 	sleep(2);
 }
diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c
index b2fd894..02ce46e 100644
--- a/source3/utils/smbget.c
+++ b/source3/utils/smbget.c
@@ -277,7 +277,6 @@ static int smb_download_file(const char *base, const char *name, int recursive,
 {
 	int remotehandle, localhandle;
 	time_t start_time = time_mono(NULL);
-	time_t now;
 	const char *newpath;
 	char path[SMB_MAXPATHLEN];
 	char checkbuf[2][RESUME_CHECK_SIZE];


-- 
Samba Shared Repository


More information about the samba-cvs mailing list