Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Jul 2015 19:10:44 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r285658 - head/usr.sbin/ctladm
Message-ID:  <201507171910.t6HJAi0V037828@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Fri Jul 17 19:10:43 2015
New Revision: 285658
URL: https://svnweb.freebsd.org/changeset/base/285658

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
  MFC after:	3 days
  Sponsored by:	gandi.net

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

Modified: head/usr.sbin/ctladm/ctladm.c
==============================================================================
--- head/usr.sbin/ctladm/ctladm.c	Fri Jul 17 17:36:33 2015	(r285657)
+++ head/usr.sbin/ctladm/ctladm.c	Fri Jul 17 19:10:43 2015	(r285658)
@@ -3661,6 +3661,7 @@ retry:
 		retval = 1;
 		goto bailout;
 	}
+	retval = 0;
 	XML_ParserFree(parser);
 
 	if (verbose != 0) {
@@ -4080,6 +4081,7 @@ retry:
 		retval = 1;
 		goto bailout;
 	}
+	retval = 0;
 	XML_ParserFree(parser);
 
 	printf("LUN Backend  %18s %4s %-16s %-16s\n", "Size (Blocks)", "BS",
@@ -4376,6 +4378,7 @@ retry:
 		retval = 1;
 		goto bailout;
 	}
+	retval = 0;
 	XML_ParserFree(parser);
 
 	if (quiet == 0)



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