Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 5 Aug 2012 12:16:11 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r239059 - head/sbin/camcontrol
Message-ID:  <201208051216.q75CGBIW081910@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: dim
Date: Sun Aug  5 12:16:11 2012
New Revision: 239059
URL: http://svn.freebsd.org/changeset/base/239059

Log:
  In sbin/camcontrol/camcontrol.c, function smpcmd(), initialize the
  'error' variable to zero, to avoid returning garbage in several cases.
  
  This fixes the following clang 3.2 warnings:
  
    sbin/camcontrol/camcontrol.c:4634:8: warning: variable 'error' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
                            if (amt_written == -1) {
                                ^~~~~~~~~~~~~~~~~
    sbin/camcontrol/camcontrol.c:4656:10: note: uninitialized use occurs here
            return (error);
                    ^~~~~
  
    sbin/camcontrol/camcontrol.c:4619:7: warning: variable 'error' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
                    if (fd_response == 0) {
                        ^~~~~~~~~~~~~~~~
    sbin/camcontrol/camcontrol.c:4656:10: note: uninitialized use occurs here
            return (error);
                    ^~~~~
  
    sbin/camcontrol/camcontrol.c:4617:6: warning: variable 'error' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
            if (((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP)
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    sbin/camcontrol/camcontrol.c:4656:10: note: uninitialized use occurs here
            return (error);
                    ^~~~~
  
  MFC after:	1 week

Modified:
  head/sbin/camcontrol/camcontrol.c

Modified: head/sbin/camcontrol/camcontrol.c
==============================================================================
--- head/sbin/camcontrol/camcontrol.c	Sun Aug  5 12:15:15 2012	(r239058)
+++ head/sbin/camcontrol/camcontrol.c	Sun Aug  5 12:16:11 2012	(r239059)
@@ -4464,7 +4464,7 @@ static int
 smpcmd(struct cam_device *device, int argc, char **argv, char *combinedopt,
        int retry_count, int timeout)
 {
-	int c, error;
+	int c, error = 0;
 	union ccb *ccb;
 	uint8_t *smp_request = NULL, *smp_response = NULL;
 	int request_size = 0, response_size = 0;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208051216.q75CGBIW081910>