Deleted Added
full compact
nvpair.c (283157) nvpair.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_nvpair.c 283157 2015-05-20 17:47:01Z oshogbo $");
31__FBSDID("$FreeBSD: head/sys/contrib/libnv/nvpair.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>

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

56#include "common_impl.h"
57#endif
58
59#ifdef HAVE_PJDLOG
60#include <pjdlog.h>
61#endif
62
63#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>

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

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

--- 1037 unchanged lines hidden ---
69#ifndef HAVE_PJDLOG
70#ifdef _KERNEL
71#define PJDLOG_ASSERT(...) MPASS(__VA_ARGS__)
72#define PJDLOG_RASSERT(expr, ...) KASSERT(expr, (__VA_ARGS__))
73#define PJDLOG_ABORT(...) panic(__VA_ARGS__)
74#else
75#include <assert.h>
76#define PJDLOG_ASSERT(...) assert(__VA_ARGS__)

--- 1037 unchanged lines hidden ---