[SCM] Samba Shared Repository - branch master updated

Volker Lendecke vlendec at samba.org
Sun Mar 27 05:18:01 MDT 2011


The branch, master has been updated
       via  b47b4c9 s3: Remove two calls to cli_errstr
      from  8cd2622 s3: Fix Coverity ID 2296: UNUSED_VALUE

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


- Log -----------------------------------------------------------------
commit b47b4c9e3dd1a3776f38b879041fb83a0edb6c36
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Mar 27 11:50:55 2011 +0200

    s3: Remove two calls to cli_errstr
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Sun Mar 27 13:17:47 CEST 2011 on sn-devel-104

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

Summary of changes:
 source3/client/client.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/client/client.c b/source3/client/client.c
index a6a7a22..000970e 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -1814,12 +1814,15 @@ static int do_put(const char *rname, const char *lname, bool reput)
 	if (reput) {
 		status = cli_open(targetcli, targetname, O_RDWR|O_CREAT, DENY_NONE, &fnum);
 		if (NT_STATUS_IS_OK(status)) {
-			if (!NT_STATUS_IS_OK(cli_qfileinfo_basic(
+			if (!NT_STATUS_IS_OK(status = cli_qfileinfo_basic(
 						     targetcli, fnum, NULL,
 						     &start, NULL, NULL,
 						     NULL, NULL, NULL)) &&
-			    !NT_STATUS_IS_OK(cli_getattrE(targetcli, fnum, NULL, &start, NULL, NULL, NULL))) {
-				d_printf("getattrib: %s\n",cli_errstr(cli));
+			    !NT_STATUS_IS_OK(status = cli_getattrE(
+						     targetcli, fnum, NULL,
+						     &start, NULL, NULL,
+						     NULL))) {
+				d_printf("getattrib: %s\n", nt_errstr(status));
 				return 1;
 			}
 		}
@@ -1828,7 +1831,8 @@ static int do_put(const char *rname, const char *lname, bool reput)
 	}
 
 	if (!NT_STATUS_IS_OK(status)) {
-		d_printf("%s opening remote file %s\n",cli_errstr(targetcli),rname);
+		d_printf("%s opening remote file %s\n", nt_errstr(status),
+			 rname);
 		return 1;
 	}
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list