git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix gcc cast warnings
[zfs.git]
/
lib
/
libzfs
/
libzfs_sendrecv.c
diff --git
a/lib/libzfs/libzfs_sendrecv.c
b/lib/libzfs/libzfs_sendrecv.c
index
3093ab9
..
8d6c438
100644
(file)
--- a/
lib/libzfs/libzfs_sendrecv.c
+++ b/
lib/libzfs/libzfs_sendrecv.c
@@
-1571,7
+1571,7
@@
recv_rename(libzfs_handle_t *hdl, const char *name, const char *tryname,
(void) strncpy(newname, name, baselen);
(void) snprintf(newname+baselen, ZFS_MAXNAMELEN-baselen,
(void) strncpy(newname, name, baselen);
(void) snprintf(newname+baselen, ZFS_MAXNAMELEN-baselen,
- "recv-%
u-%u",
getpid(), seq);
+ "recv-%
ld-%u", (long)
getpid(), seq);
(void) strlcpy(zc.zc_value, newname, sizeof (zc.zc_value));
if (flags.verbose) {
(void) strlcpy(zc.zc_value, newname, sizeof (zc.zc_value));
if (flags.verbose) {
@@
-2490,7
+2490,7
@@
zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
(void) printf("found clone origin %s\n", zc.zc_string);
}
(void) printf("found clone origin %s\n", zc.zc_string);
}
- stream_wantsnewfs = (drrb->drr_fromguid ==
NULL
||
+ stream_wantsnewfs = (drrb->drr_fromguid ==
0
||
(drrb->drr_flags & DRR_FLAG_CLONE));
if (stream_wantsnewfs) {
(drrb->drr_flags & DRR_FLAG_CLONE));
if (stream_wantsnewfs) {