From owner-svn-src-all@FreeBSD.ORG  Sat Jan 22 22:38:19 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 48CF3106566C;
	Sat, 22 Jan 2011 22:38:19 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D2AB8FC0C;
	Sat, 22 Jan 2011 22:38:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0MMcJ79006850;
	Sat, 22 Jan 2011 22:38:19 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0MMcITu006847;
	Sat, 22 Jan 2011 22:38:18 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201101222238.p0MMcITu006847@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sat, 22 Jan 2011 22:38:18 +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: r217732 - head/sbin/hastd
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: Sat, 22 Jan 2011 22:38:19 -0000

Author: pjd
Date: Sat Jan 22 22:38:18 2011
New Revision: 217732
URL: http://svn.freebsd.org/changeset/base/217732

Log:
  Add nv_assert() which allows to assert that the given name exists.
  
  MFC after:	1 week

Modified:
  head/sbin/hastd/nv.c
  head/sbin/hastd/nv.h

Modified: head/sbin/hastd/nv.c
==============================================================================
--- head/sbin/hastd/nv.c	Sat Jan 22 22:35:08 2011	(r217731)
+++ head/sbin/hastd/nv.c	Sat Jan 22 22:38:18 2011	(r217732)
@@ -563,11 +563,10 @@ nv_get_string(struct nv *nv, const char 
 	return (str);
 }
 
-bool
-nv_exists(struct nv *nv, const char *namefmt, ...)
+static bool
+nv_vexists(struct nv *nv, const char *namefmt, va_list nameap)
 {
 	struct nvhdr *nvh;
-	va_list nameap;
 	int snverror, serrno;
 
 	if (nv == NULL)
@@ -576,9 +575,7 @@ nv_exists(struct nv *nv, const char *nam
 	serrno = errno;
 	snverror = nv->nv_error;
 
-	va_start(nameap, namefmt);
 	nvh = nv_find(nv, NV_TYPE_NONE, namefmt, nameap);
-	va_end(nameap);
 
 	errno = serrno;
 	nv->nv_error = snverror;
@@ -586,6 +583,29 @@ nv_exists(struct nv *nv, const char *nam
 	return (nvh != NULL);
 }
 
+bool
+nv_exists(struct nv *nv, const char *namefmt, ...)
+{
+	va_list nameap;
+	bool ret;
+
+	va_start(nameap, namefmt);
+	ret = nv_vexists(nv, namefmt, nameap);
+	va_end(nameap);
+
+	return (ret);
+}
+
+void
+nv_assert(struct nv *nv, const char *namefmt, ...)
+{
+	va_list nameap;
+
+	va_start(nameap, namefmt);
+	assert(nv_vexists(nv, namefmt, nameap));
+	va_end(nameap);
+}
+
 /*
  * Dump content of the nv structure.
  */

Modified: head/sbin/hastd/nv.h
==============================================================================
--- head/sbin/hastd/nv.h	Sat Jan 22 22:35:08 2011	(r217731)
+++ head/sbin/hastd/nv.h	Sat Jan 22 22:38:18 2011	(r217732)
@@ -127,6 +127,7 @@ const char *nv_get_string(struct nv *nv,
     __printflike(2, 3);
 
 bool nv_exists(struct nv *nv, const char *namefmt, ...) __printflike(2, 3);
+void nv_assert(struct nv *nv, const char *namefmt, ...) __printflike(2, 3);
 void nv_dump(struct nv *nv);
 
 #endif	/* !_NV_H_ */