From owner-svn-src-head@FreeBSD.ORG  Sun Aug  5 17:23:47 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id BB46D106564A;
	Sun,  5 Aug 2012 17:23:47 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8CBA68FC08;
	Sun,  5 Aug 2012 17:23:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q75HNlhT006963;
	Sun, 5 Aug 2012 17:23:47 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q75HNl80006961;
	Sun, 5 Aug 2012 17:23:47 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201208051723.q75HNl80006961@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 5 Aug 2012 17:23:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239074 - head/usr.sbin/ctladm
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Aug 2012 17:23:47 -0000

Author: dim
Date: Sun Aug  5 17:23:47 2012
New Revision: 239074
URL: http://svn.freebsd.org/changeset/base/239074

Log:
  In usr.sbin/ctladm/ctladm.c, function cctl_error_inject(), initialize
  the 'retval' variable to zero, to avoid returning garbage in several
  cases.
  
  This fixes the following clang 3.2 warnings:
  
    usr.sbin/ctladm/ctladm.c:1234:6: error: variable 'retval' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
            if (ioctl(fd, CTL_ERROR_INJECT, &err_desc) == -1) {
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    usr.sbin/ctladm/ctladm.c:1243:10: note: uninitialized use occurs here
            return (retval);
                    ^~~~~~
    usr.sbin/ctladm/ctladm.c:1234:2: note: remove the 'if' if its condition is always true
            if (ioctl(fd, CTL_ERROR_INJECT, &err_desc) == -1) {
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    usr.sbin/ctladm/ctladm.c:1161:7: error: variable 'retval' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
                    if (ioctl(fd, CTL_ERROR_INJECT_DELETE, &err_desc) == -1) {
                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    usr.sbin/ctladm/ctladm.c:1243:10: note: uninitialized use occurs here
            return (retval);
                    ^~~~~~
    usr.sbin/ctladm/ctladm.c:1161:3: note: remove the 'if' if its condition is always true
                    if (ioctl(fd, CTL_ERROR_INJECT_DELETE, &err_desc) == -1) {
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    usr.sbin/ctladm/ctladm.c:1029:12: note: initialize the variable 'retval' to silence this warning
            int retval;
                      ^
                       = 0
  
  MFC after:      1 week

Modified:
  head/usr.sbin/ctladm/ctladm.c

Modified: head/usr.sbin/ctladm/ctladm.c
==============================================================================
--- head/usr.sbin/ctladm/ctladm.c	Sun Aug  5 17:04:58 2012	(r239073)
+++ head/usr.sbin/ctladm/ctladm.c	Sun Aug  5 17:23:47 2012	(r239074)
@@ -1026,7 +1026,7 @@ static int
 cctl_error_inject(int fd, uint32_t target, uint32_t lun, int argc, char **argv, 
 		  char *combinedopt)
 {
-	int retval;
+	int retval = 0;
 	struct ctl_error_desc err_desc;
 	uint64_t lba = 0;
 	uint32_t len = 0;