From owner-svn-src-all@FreeBSD.ORG  Wed Jul 17 23:14:41 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D04B05F8;
 Wed, 17 Jul 2013 23:14:41 +0000 (UTC)
 (envelope-from jimharris@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C2B2C23B;
 Wed, 17 Jul 2013 23:14:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6HNEfde073143;
 Wed, 17 Jul 2013 23:14:41 GMT
 (envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6HNEfRQ073142;
 Wed, 17 Jul 2013 23:14:41 GMT
 (envelope-from jimharris@svn.freebsd.org)
Message-Id: <201307172314.r6HNEfRQ073142@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Wed, 17 Jul 2013 23:14:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253436 - head/sbin/nvmecontrol
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Wed, 17 Jul 2013 23:14:41 -0000

Author: jimharris
Date: Wed Jul 17 23:14:41 2013
New Revision: 253436
URL: http://svnweb.freebsd.org/changeset/base/253436

Log:
  Always initialize fd to 0 in open_dev().
  
  Sponsored by:	Intel
  Reviewed by:	carl
  MFC after:	3 days

Modified:
  head/sbin/nvmecontrol/nvmecontrol.c

Modified: head/sbin/nvmecontrol/nvmecontrol.c
==============================================================================
--- head/sbin/nvmecontrol/nvmecontrol.c	Wed Jul 17 23:03:10 2013	(r253435)
+++ head/sbin/nvmecontrol/nvmecontrol.c	Wed Jul 17 23:14:41 2013	(r253436)
@@ -166,6 +166,8 @@ open_dev(const char *str, int *fd, int s
 	struct stat	devstat;
 	char		full_path[64];
 
+	*fd = 0;
+
 	if (!strnstr(str, NVME_CTRLR_PREFIX, strlen(NVME_CTRLR_PREFIX))) {
 		if (show_error)
 			warnx("controller/namespace ids must begin with '%s'",