Deleted Added
full compact
nvlist.c (283158) nvlist.c (285139)
1/*-
2 * Copyright (c) 2009-2013 The FreeBSD Foundation
3 * All rights reserved.
4 *
5 * This software was developed by Pawel Jakub Dawidek under sponsorship from
6 * the FreeBSD Foundation.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 14 unchanged lines hidden (view full) ---

23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 */
29
30#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2009-2013 The FreeBSD Foundation
3 * All rights reserved.
4 *
5 * This software was developed by Pawel Jakub Dawidek under sponsorship from
6 * the FreeBSD Foundation.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 14 unchanged lines hidden (view full) ---

23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 */
29
30#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: head/sys/kern/subr_nvlist.c 283158 2015-05-20 17:48:22Z oshogbo $");
31__FBSDID("$FreeBSD: head/sys/contrib/libnv/nvlist.c 285139 2015-07-04 16:33:37Z oshogbo $");
32
33#include <sys/param.h>
34#include <sys/endian.h>
35#include <sys/queue.h>
36
37#ifdef _KERNEL
38
39#include <sys/errno.h>

--- 20 unchanged lines hidden (view full) ---

60#include "msgio.h"
61#endif
62
63#ifdef HAVE_PJDLOG
64#include <pjdlog.h>
65#endif
66
67#include <sys/nv.h>
32
33#include <sys/param.h>
34#include <sys/endian.h>
35#include <sys/queue.h>
36
37#ifdef _KERNEL
38
39#include <sys/errno.h>

--- 20 unchanged lines hidden (view full) ---

60#include "msgio.h"
61#endif
62
63#ifdef HAVE_PJDLOG
64#include <pjdlog.h>
65#endif
66
67#include <sys/nv.h>
68#include <sys/nv_impl.h>
69#include <sys/nvlist_impl.h>
70#include <sys/nvpair_impl.h>
71
68
69#include "nv_impl.h"
70#include "nvlist_impl.h"
71#include "nvpair_impl.h"
72
72#ifndef HAVE_PJDLOG
73#ifdef _KERNEL
74#define PJDLOG_ASSERT(...) MPASS(__VA_ARGS__)
75#define PJDLOG_RASSERT(expr, ...) KASSERT(expr, (__VA_ARGS__))
76#define PJDLOG_ABORT(...) panic(__VA_ARGS__)
77#else
78#include <assert.h>
79#define PJDLOG_ASSERT(...) assert(__VA_ARGS__)

--- 1358 unchanged lines hidden ---
73#ifndef HAVE_PJDLOG
74#ifdef _KERNEL
75#define PJDLOG_ASSERT(...) MPASS(__VA_ARGS__)
76#define PJDLOG_RASSERT(expr, ...) KASSERT(expr, (__VA_ARGS__))
77#define PJDLOG_ABORT(...) panic(__VA_ARGS__)
78#else
79#include <assert.h>
80#define PJDLOG_ASSERT(...) assert(__VA_ARGS__)

--- 1358 unchanged lines hidden ---