Deleted Added
full compact
zfs_main.c (268075) zfs_main.c (268473)
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

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

16 * fields enclosed by brackets "[]" replaced with your own identifying
17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 *
19 * CDDL HEADER END
20 */
21
22/*
23 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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

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

16 * fields enclosed by brackets "[]" replaced with your own identifying
17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 *
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.
24 * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
25 * Copyright 2012 Milan Jurik. All rights reserved.
26 * Copyright (c) 2012, Joyent, Inc. All rights reserved.
27 * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>.
28 * All rights reserved.
29 * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved.
30 * Copyright (c) 2013 Steven Hartland. All rights reserved.
31 * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
32 */

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

6851 err_msg = "bookmark exists";
6852 break;
6853 case EINVAL:
6854 err_msg = "invalid argument";
6855 break;
6856 case ENOTSUP:
6857 err_msg = "bookmark feature not enabled";
6858 break;
25 * Copyright 2012 Milan Jurik. All rights reserved.
26 * Copyright (c) 2012, Joyent, Inc. All rights reserved.
27 * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>.
28 * All rights reserved.
29 * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved.
30 * Copyright (c) 2013 Steven Hartland. All rights reserved.
31 * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
32 */

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

6851 err_msg = "bookmark exists";
6852 break;
6853 case EINVAL:
6854 err_msg = "invalid argument";
6855 break;
6856 case ENOTSUP:
6857 err_msg = "bookmark feature not enabled";
6858 break;
6859 case ENOSPC:
6860 err_msg = "out of space";
6861 break;
6859 default:
6860 err_msg = "unknown error";
6861 break;
6862 }
6863 (void) fprintf(stderr, "%s: %s\n", errbuf,
6864 dgettext(TEXT_DOMAIN, err_msg));
6865 }
6866
6862 default:
6863 err_msg = "unknown error";
6864 break;
6865 }
6866 (void) fprintf(stderr, "%s: %s\n", errbuf,
6867 dgettext(TEXT_DOMAIN, err_msg));
6868 }
6869
6867 return (ret);
6870 return (ret != 0);
6868
6869usage:
6870 usage(B_FALSE);
6871 return (-1);
6872}
6873
6874int
6875main(int argc, char **argv)

--- 108 unchanged lines hidden ---
6871
6872usage:
6873 usage(B_FALSE);
6874 return (-1);
6875}
6876
6877int
6878main(int argc, char **argv)

--- 108 unchanged lines hidden ---