Deleted Added
full compact
libzfs_iter.c (263407) libzfs_iter.c (277587)
1/*
2 * CDDL HEADER START
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

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

19 * CDDL HEADER END
20 */
21
22/*
23 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
24 * Copyright (c) 2013 by Delphix. All rights reserved.
25 * Copyright (c) 2012 Pawel Jakub Dawidek <pawel@dawidek.net>.
26 * All rights reserved.
1/*
2 * CDDL HEADER START
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

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

19 * CDDL HEADER END
20 */
21
22/*
23 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
24 * Copyright (c) 2013 by Delphix. All rights reserved.
25 * Copyright (c) 2012 Pawel Jakub Dawidek <pawel@dawidek.net>.
26 * All rights reserved.
27 * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
27 * Copyright 2014 Nexenta Systems, Inc. All rights reserved.
28 */
29
30#include <stdio.h>
31#include <stdlib.h>
32#include <strings.h>
33#include <unistd.h>
34#include <stddef.h>
35#include <libintl.h>

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

188 return (0);
189
190 /* Setup the requested properties nvlist. */
191 props = fnvlist_alloc();
192 fnvlist_add_boolean(props, zfs_prop_to_name(ZFS_PROP_GUID));
193 fnvlist_add_boolean(props, zfs_prop_to_name(ZFS_PROP_CREATETXG));
194 fnvlist_add_boolean(props, zfs_prop_to_name(ZFS_PROP_CREATION));
195
28 */
29
30#include <stdio.h>
31#include <stdlib.h>
32#include <strings.h>
33#include <unistd.h>
34#include <stddef.h>
35#include <libintl.h>

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

188 return (0);
189
190 /* Setup the requested properties nvlist. */
191 props = fnvlist_alloc();
192 fnvlist_add_boolean(props, zfs_prop_to_name(ZFS_PROP_GUID));
193 fnvlist_add_boolean(props, zfs_prop_to_name(ZFS_PROP_CREATETXG));
194 fnvlist_add_boolean(props, zfs_prop_to_name(ZFS_PROP_CREATION));
195
196 /* Allocate an nvlist to hold the bookmarks. */
197 bmarks = fnvlist_alloc();
198
199 if ((err = lzc_get_bookmarks(zhp->zfs_name, props, &bmarks)) != 0)
200 goto out;
201
202 for (nvpair_t *pair = nvlist_next_nvpair(bmarks, NULL);
203 pair != NULL; pair = nvlist_next_nvpair(bmarks, pair)) {
204 char name[ZFS_MAXNAMELEN];
205 char *bmark_name;
206 nvlist_t *bmark_props;

--- 323 unchanged lines hidden ---
196 if ((err = lzc_get_bookmarks(zhp->zfs_name, props, &bmarks)) != 0)
197 goto out;
198
199 for (nvpair_t *pair = nvlist_next_nvpair(bmarks, NULL);
200 pair != NULL; pair = nvlist_next_nvpair(bmarks, pair)) {
201 char name[ZFS_MAXNAMELEN];
202 char *bmark_name;
203 nvlist_t *bmark_props;

--- 323 unchanged lines hidden ---