Mercurial > illumos > nfs4.1

changeset 1613:aca102a242d3 onnv_36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6396628 zpool offline does not recognize c0d0 patten recently 6397071 persistently unavailable devices print extra newline
author eschrock
date Mon, 13 Mar 2006 19:23:21 -0800
parents f22bd5bc2aff
children 6743605c1475
files usr/src/cmd/zpool/zpool_main.c usr/src/lib/libzfs/common/libzfs_pool.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/zpool/zpool_main.c	Mon Mar 13 18:33:17 2006 -0800
+++ b/usr/src/cmd/zpool/zpool_main.c	Mon Mar 13 19:23:21 2006 -0800
@@ -2281,7 +2281,7 @@
 	    &notpresent) == 0) {
 		char *path;
 		verify(nvlist_lookup_string(nv, ZPOOL_CONFIG_PATH, &path) == 0);
-		(void) printf("  was %s\n", path);
+		(void) printf("  was %s", path);
 	} else if (vs->vs_aux != 0) {
 		(void) printf("  ");
 
--- a/usr/src/lib/libzfs/common/libzfs_pool.c	Mon Mar 13 18:33:17 2006 -0800
+++ b/usr/src/lib/libzfs/common/libzfs_pool.c	Mon Mar 13 19:23:21 2006 -0800
@@ -890,7 +890,7 @@
 	nvlist_t *nvroot;
 	uint64_t guid;
 
-	guid = strtoull(path, &end, 16);
+	guid = strtoull(path, &end, 10);
 	if (guid != 0 && *end == '\0') {
 		search = NULL;
 	} else if (path[0] != '/') {
@@ -1403,7 +1403,7 @@
 	    &value) == 0) {
 		verify(nvlist_lookup_uint64(nv, ZPOOL_CONFIG_GUID,
 		    &value) == 0);
-		(void) snprintf(buf, sizeof (buf), "%llx", value);
+		(void) snprintf(buf, sizeof (buf), "%llu", value);
 		path = buf;
 	} else if (nvlist_lookup_string(nv, ZPOOL_CONFIG_PATH, &path) == 0) {