Module Name: src
Committed By: christos
Date: Sat Sep 8 14:32:25 UTC 2018
Modified Files:
src/sys/external/bsd/libnv/dist: dnvlist.c nvlist.c nvpair.c
Log Message:
fix kernel build.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/libnv/dist/dnvlist.c \
src/sys/external/bsd/libnv/dist/nvlist.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/libnv/dist/nvpair.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/libnv/dist/dnvlist.c
diff -u src/sys/external/bsd/libnv/dist/dnvlist.c:1.3 src/sys/external/bsd/libnv/dist/dnvlist.c:1.4
--- src/sys/external/bsd/libnv/dist/dnvlist.c:1.3 Sat Sep 8 10:12:53 2018
+++ src/sys/external/bsd/libnv/dist/dnvlist.c Sat Sep 8 10:32:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dnvlist.c,v 1.3 2018/09/08 14:12:53 christos Exp $ */
+/* $NetBSD: dnvlist.c,v 1.4 2018/09/08 14:32:25 christos Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -35,7 +35,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: head/sys/contrib/libnv/dnvlist.c 328474 2018-01-27 12:58:21Z oshogbo $");
#else
-__RCSID("$NetBSD: dnvlist.c,v 1.3 2018/09/08 14:12:53 christos Exp $");
+__RCSID("$NetBSD: dnvlist.c,v 1.4 2018/09/08 14:32:25 christos Exp $");
#endif
#if defined(_KERNEL) || defined(_STANDALONE)
@@ -46,7 +46,7 @@ __RCSID("$NetBSD: dnvlist.c,v 1.3 2018/0
#include <sys/systm.h>
#include <sys/malloc.h>
-#ifndef __FreeBSD__
+#ifdef __FreeBSD__
#include <machine/stdarg.h>
#endif
Index: src/sys/external/bsd/libnv/dist/nvlist.c
diff -u src/sys/external/bsd/libnv/dist/nvlist.c:1.3 src/sys/external/bsd/libnv/dist/nvlist.c:1.4
--- src/sys/external/bsd/libnv/dist/nvlist.c:1.3 Sat Sep 8 10:12:53 2018
+++ src/sys/external/bsd/libnv/dist/nvlist.c Sat Sep 8 10:32:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nvlist.c,v 1.3 2018/09/08 14:12:53 christos Exp $ */
+/* $NetBSD: nvlist.c,v 1.4 2018/09/08 14:32:25 christos Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -36,7 +36,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: head/sys/contrib/libnv/nvlist.c 335347 2018-06-18 22:57:32Z oshogbo $");
#else
-__RCSID("$NetBSD: nvlist.c,v 1.3 2018/09/08 14:12:53 christos Exp $");
+__RCSID("$NetBSD: nvlist.c,v 1.4 2018/09/08 14:32:25 christos Exp $");
#endif
#include <sys/param.h>
@@ -1508,7 +1508,6 @@ nvlist_add_stringf(nvlist_t *nvl, const
nvlist_add_stringv(nvl, name, valuefmt, valueap);
va_end(valueap);
}
-#endif
void
nvlist_add_stringv(nvlist_t *nvl, const char *name, const char *valuefmt,
@@ -1529,6 +1528,7 @@ nvlist_add_stringv(nvlist_t *nvl, const
(void)nvlist_move_nvpair(nvl, nvp);
}
}
+#endif
void
nvlist_add_null(nvlist_t *nvl, const char *name)
Index: src/sys/external/bsd/libnv/dist/nvpair.c
diff -u src/sys/external/bsd/libnv/dist/nvpair.c:1.2 src/sys/external/bsd/libnv/dist/nvpair.c:1.3
--- src/sys/external/bsd/libnv/dist/nvpair.c:1.2 Sat Sep 8 10:02:15 2018
+++ src/sys/external/bsd/libnv/dist/nvpair.c Sat Sep 8 10:32:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nvpair.c,v 1.2 2018/09/08 14:02:15 christos Exp $ */
+/* $NetBSD: nvpair.c,v 1.3 2018/09/08 14:32:25 christos Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -36,7 +36,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: head/sys/contrib/libnv/nvpair.c 335382 2018-06-19 18:43:02Z lwhsu $");
#else
-__RCSID("$NetBSD: nvpair.c,v 1.2 2018/09/08 14:02:15 christos Exp $");
+__RCSID("$NetBSD: nvpair.c,v 1.3 2018/09/08 14:32:25 christos Exp $");
#endif
#include <sys/param.h>
@@ -1191,6 +1191,7 @@ nvpair_name(const nvpair_t *nvp)
return (nvp->nvp_name);
}
+#if !defined(_KERNEL) && !defined(_STANDALONE) && !defined(__NetBSD__)
nvpair_t *
nvpair_create_stringf(const char *name, const char *valuefmt, ...)
{
@@ -1219,6 +1220,7 @@ nvpair_create_stringv(const char *name,
nv_free(str);
return (nvp);
}
+#endif
nvpair_t *
nvpair_create_null(const char *name)
