From f73c835830770917ae5f82c0f3223c0a70a761d5 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 16 Dec 2008 15:44:02 -0800 Subject: [PATCH 1/2] Add include patch to pick up fletcher.c which for some unknown reason is included instead of simply being build as source. This should be fixed eventually, but it is how the OpenSolaris source handles it. --- lib/libzfs/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am index d4da81dcfd..9fc11ccab0 100644 --- a/lib/libzfs/Makefile.am +++ b/lib/libzfs/Makefile.am @@ -6,6 +6,7 @@ DEFAULT_INCLUDES += \ -I${top_srcdir}/lib/libspl/include \ -I${top_srcdir}/lib/libnvpair/include \ -I${top_srcdir}/lib/libuutil/include \ + -I${top_srcdir}/module/zfs \ -I${top_srcdir}/module/zfs/include \ -I${top_srcdir}/module/zcommon/include \ -I${top_srcdir}/module/nvpair/include \ From 3c515284a624d0e015f0d2028fb50a648f975241 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 16 Dec 2008 15:49:21 -0800 Subject: [PATCH 2/2] Remove double declaration of char * --- lib/libzfs/libzfs_sendrecv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libzfs/libzfs_sendrecv.c b/lib/libzfs/libzfs_sendrecv.c index a3ed5cea85..9d49091d85 100644 --- a/lib/libzfs/libzfs_sendrecv.c +++ b/lib/libzfs/libzfs_sendrecv.c @@ -1852,13 +1852,13 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap, */ avl_tree_t *local_avl; nvlist_t *local_nv, *fs; - char *cp = strchr(zc.zc_value, '@'); /* * XXX Do this faster by just iterating over snaps in * this fs. Also if zc_value does not exist, we will * get a strange "does not exist" error message. */ + cp = strchr(zc.zc_value, '@'); *cp = '\0'; if (gather_nvlist(hdl, zc.zc_value, NULL, NULL, &local_nv, &local_avl) == 0) {