From d21705eab952e5aa1c0bcf920b76e8428384d80b Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 24 Jan 2014 15:43:07 -0800 Subject: [PATCH] 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 Signed-off-by: Chris Dunlap Issue #2 --- cmd/zpool/zpool_main.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c index cc13e3739394..e38213c8520e 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] : ""); + + break; + } + case DATA_TYPE_BOOLEAN_ARRAY: case DATA_TYPE_BYTE_ARRAY: case DATA_TYPE_DOUBLE: