From owner-svn-src-all@FreeBSD.ORG  Mon Aug 22 18:58:09 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4203C1065670;
	Mon, 22 Aug 2011 18:58:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 31C558FC12;
	Mon, 22 Aug 2011 18:58:09 +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 p7MIw9TC064383;
	Mon, 22 Aug 2011 18:58:09 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7MIw975064381;
	Mon, 22 Aug 2011 18:58:09 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201108221858.p7MIw975064381@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 22 Aug 2011 18:58:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225085 - stable/7/usr.sbin/mfiutil
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Aug 2011 18:58:09 -0000

Author: jhb
Date: Mon Aug 22 18:58:08 2011
New Revision: 225085
URL: http://svn.freebsd.org/changeset/base/225085

Log:
  MFC 224495:
  Properly initialize an error variable to avoid returning uninitialized
  data when 'show drives' succeeds, often resulting in a failing exit code
  even though the command worked fine.

Modified:
  stable/7/usr.sbin/mfiutil/mfi_show.c
Directory Properties:
  stable/7/usr.sbin/mfiutil/   (props changed)

Modified: stable/7/usr.sbin/mfiutil/mfi_show.c
==============================================================================
--- stable/7/usr.sbin/mfiutil/mfi_show.c	Mon Aug 22 18:57:59 2011	(r225084)
+++ stable/7/usr.sbin/mfiutil/mfi_show.c	Mon Aug 22 18:58:08 2011	(r225085)
@@ -533,6 +533,7 @@ show_drives(int ac, char **av)
 		    MFI_DNAME_ES));
 		printf("\n");
 	}
+	error = 0;
 error:
 	free(list);
 	close(fd);