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
3.10 API change: block_device_operations->release() returns void
[zfs.git]
/
lib
/
libzfs
/
libzfs_diff.c
diff --git
a/lib/libzfs/libzfs_diff.c
b/lib/libzfs/libzfs_diff.c
index
8140a70
..
77d5a09
100644
(file)
--- a/
lib/libzfs/libzfs_diff.c
+++ b/
lib/libzfs/libzfs_diff.c
@@
-141,7
+141,7
@@
stream_bytes(FILE *fp, const char *string)
if (*string > ' ' && *string != '\\' && *string < '\177')
(void) fprintf(fp, "%c", *string++);
else
if (*string > ' ' && *string != '\\' && *string < '\177')
(void) fprintf(fp, "%c", *string++);
else
- (void) fprintf(fp, "\\%03o", *string++);
+ (void) fprintf(fp, "\\%03o",
(unsigned char)
*string++);
}
}
}
}
@@
-430,7
+430,7
@@
differ(void *arg)
if ((ofp = fdopen(di->outputfd, "w")) == NULL) {
di->zerr = errno;
if ((ofp = fdopen(di->outputfd, "w")) == NULL) {
di->zerr = errno;
-
(void) strerror_r(errno, di->errbuf
, sizeof (di->errbuf));
+
strncpy(di->errbuf, strerror(errno)
, sizeof (di->errbuf));
(void) close(di->datafd);
return ((void *)-1);
}
(void) close(di->datafd);
return ((void *)-1);
}