From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 24 Jan 2014 23:43:07 +0000 (-0800)
Subject: Add missing DATA_TYPE_STRING_ARRAY output
X-Git-Tag: zfs-0.6.3~65^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d21705eab952e5aa1c0bcf920b76e8428384d80b;p=zfs

Add missing DATA_TYPE_STRING_ARRAY output

This functionality has always been missing.  But until now there
were no zevents which included an array of strings so it wasn't
missed.  However, that's now changed so to ensure this information
is output correctly by 'zpool events -v' the DATA_TYPE_STRING_ARRAY
has been implemented.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Chris Dunlap <cdunlap@llnl.gov>
Issue #2
---

diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
index cc13e3739..e38213c85 100644
--- a/cmd/zpool/zpool_main.c
+++ b/cmd/zpool/zpool_main.c
@@ -5439,7 +5439,18 @@ zpool_do_events_nvprint(nvlist_t *nvl, int depth)
 			break;
 			}
 
-		case DATA_TYPE_STRING_ARRAY:
+		case DATA_TYPE_STRING_ARRAY: {
+			char **str;
+			uint_t i, nelem;
+
+			(void) nvpair_value_string_array(nvp, &str, &nelem);
+			for (i = 0; i < nelem; i++)
+				printf(gettext("\"%s\" "),
+				    str[i] ? str[i] : "<NULL>");
+
+			break;
+			}
+
 		case DATA_TYPE_BOOLEAN_ARRAY:
 		case DATA_TYPE_BYTE_ARRAY:
 		case DATA_TYPE_DOUBLE: