CVS commit: src/external/cddl/osnet/dist/cmd/zfs

2021-05-13 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Thu May 13 09:03:35 UTC 2021

Modified Files:
src/external/cddl/osnet/dist/cmd/zfs: zfs_main.c

Log Message:
zfs: this is not FreeBSD


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c
diff -u src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c:1.7 src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c:1.8
--- src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c:1.7	Sun Sep 15 19:38:09 2019
+++ src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c	Thu May 13 09:03:35 2021
@@ -6130,7 +6130,7 @@ share_mount(int op, int argc, char **arg
 			break;
 
 		case 'O':
-			warnx("no overlay mounts support on FreeBSD, ignoring");
+			warnx("no overlay mounts support on NetBSD, ignoring");
 			break;
 		case ':':
 			(void) fprintf(stderr, gettext("missing argument for "



CVS commit: src/external/cddl/osnet/dist/cmd/zfs

2015-04-10 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Fri Apr 10 22:28:27 UTC 2015

Modified Files:
src/external/cddl/osnet/dist/cmd/zfs: zfs_main.c

Log Message:
Use 0, not NULL, for zero integer constant.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c
diff -u src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c:1.4 src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c:1.5
--- src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c:1.4	Thu Jan  3 16:41:51 2013
+++ src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c	Fri Apr 10 22:28:27 2015
@@ -2494,7 +2494,7 @@ zfs_do_set(int argc, char **argv)
 		usage(B_FALSE);
 	}
 
-	ret = zfs_for_each(argc - 2, argv + 2, NULL,
+	ret = zfs_for_each(argc - 2, argv + 2, 0,
 	ZFS_TYPE_DATASET, NULL, NULL, 0, set_callback, cb);
 
 	return (ret);