svn commit: samba r17863 - in branches: SAMBA_3_0/source/libsmb SAMBA_3_0_23/source/libsmb

[jra at samba.org]

Author: jra
Date: 2006-08-28 01:56:17 +0000 (Mon, 28 Aug 2006)
New Revision: 17863

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17863

Log:
Fix unneeded NULL check on pointer parameters causing the
Stanford checker to flag null deref.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/libsmb/clierror.c
   branches/SAMBA_3_0_23/source/libsmb/clierror.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/clierror.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/clierror.c	2006-08-28 01:48:04 UTC (rev 17862)
+++ branches/SAMBA_3_0/source/libsmb/clierror.c	2006-08-28 01:56:17 UTC (rev 17863)
@@ -201,8 +201,6 @@
 void cli_dos_error(struct cli_state *cli, uint8 *eclass, uint32 *ecode)
 {
 	int  flgs2;
-	char rcls;
-	int code;
 
 	if(!cli->initialised) {
 		return;
@@ -223,11 +221,8 @@
                 return;
         }
 
-	rcls  = CVAL(cli->inbuf,smb_rcls);
-	code  = SVAL(cli->inbuf,smb_err);
-
-	if (eclass) *eclass = rcls;
-	if (ecode) *ecode    = code;
+	*eclass  = CVAL(cli->inbuf,smb_rcls);
+	*ecode  = SVAL(cli->inbuf,smb_err);
 }
 
 /* Return a UNIX errno from a NT status code */

Modified: branches/SAMBA_3_0_23/source/libsmb/clierror.c
===================================================================
--- branches/SAMBA_3_0_23/source/libsmb/clierror.c	2006-08-28 01:48:04 UTC (rev 17862)
+++ branches/SAMBA_3_0_23/source/libsmb/clierror.c	2006-08-28 01:56:17 UTC (rev 17863)
@@ -201,8 +201,6 @@
 void cli_dos_error(struct cli_state *cli, uint8 *eclass, uint32 *ecode)
 {
 	int  flgs2;
-	char rcls;
-	int code;
 
 	if(!cli->initialised) {
 		return;
@@ -223,11 +221,8 @@
                 return;
         }
 
-	rcls  = CVAL(cli->inbuf,smb_rcls);
-	code  = SVAL(cli->inbuf,smb_err);
-
-	if (eclass) *eclass = rcls;
-	if (ecode) *ecode    = code;
+	*eclass  = CVAL(cli->inbuf,smb_rcls);
+	*ecode  = SVAL(cli->inbuf,smb_err);
 }
 
 /* Return a UNIX errno from a NT status code */