From owner-svn-src-all@freebsd.org  Tue Jul 28 05:48:59 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D779D9ACF1E;
 Tue, 28 Jul 2015 05:48:59 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C78B31373;
 Tue, 28 Jul 2015 05:48:59 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6S5mxPR027877;
 Tue, 28 Jul 2015 05:48:59 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6S5mxvc027876;
 Tue, 28 Jul 2015 05:48:59 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201507280548.t6S5mxvc027876@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 28 Jul 2015 05:48:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r285929 - stable/10/usr.sbin/ctladm
X-SVN-Group: stable-10
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.20
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: Tue, 28 Jul 2015 05:48:59 -0000

Author: bapt
Date: Tue Jul 28 05:48:58 2015
New Revision: 285929
URL: https://svnweb.freebsd.org/changeset/base/285929

Log:
  make ctdladm(8) return 0 is everything was ok.
  
  retval is used to test the return of XML_Parse function which is ok if 1 is
  returned and retval it directly returned to the main function and used as an
  exit value.
  
  if all the parsing part is done reset retval to 0 so that the command return 0
  if everything ok
  
  Differential Revision:	https://reviews.freebsd.org/D3102
  Reviewed by:	trasz
  Sponsored by:	gandi.net

Modified:
  stable/10/usr.sbin/ctladm/ctladm.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/ctladm/ctladm.c
==============================================================================
--- stable/10/usr.sbin/ctladm/ctladm.c	Tue Jul 28 05:46:37 2015	(r285928)
+++ stable/10/usr.sbin/ctladm/ctladm.c	Tue Jul 28 05:48:58 2015	(r285929)
@@ -3657,6 +3657,7 @@ retry:
 		retval = 1;
 		goto bailout;
 	}
+	retval = 0;
 	XML_ParserFree(parser);
 
 	if (verbose != 0) {
@@ -4075,6 +4076,7 @@ retry:
 		retval = 1;
 		goto bailout;
 	}
+	retval = 0;
 	XML_ParserFree(parser);
 
 	printf("LUN Backend  %18s %4s %-16s %-16s\n", "Size (Blocks)", "BS",
@@ -4371,6 +4373,7 @@ retry:
 		retval = 1;
 		goto bailout;
 	}
+	retval = 0;
 	XML_ParserFree(parser);
 
 	if (quiet == 0)