From bd7f70daa5a51dbb1a88ca8a7a539005d43603f6 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Mon, 4 Jan 2016 03:12:18 +0000 Subject: [PATCH] Convert another `string` variable to `string_arr` missed in r293130 Differential Revision: https://reviews.freebsd.org/D4769 (part of larger diff) MFC after: 5 days Reviewed by: oshogbo Sponsored by: EMC / Isilon Storage Division --- lib/libnv/tests/nv_array_tests.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libnv/tests/nv_array_tests.cc b/lib/libnv/tests/nv_array_tests.cc index 8f86cbe14ff6..e407f3f64418 100644 --- a/lib/libnv/tests/nv_array_tests.cc +++ b/lib/libnv/tests/nv_array_tests.cc @@ -1057,7 +1057,7 @@ ATF_TEST_CASE_BODY(nvlist_string_array__pack) void *packed; unsigned int i; const char * const *const_result; - const char *string[8] = { "a", "b", "kot", "foo", + const char *string_arr[8] = { "a", "b", "kot", "foo", "tests", "nice test", "", "abcdef" }; key = "nvl/string"; @@ -1066,7 +1066,7 @@ ATF_TEST_CASE_BODY(nvlist_string_array__pack) ATF_REQUIRE(nvlist_empty(nvl)); ATF_REQUIRE(!nvlist_exists_string_array(nvl, key)); - nvlist_add_string_array(nvl, key, string, 8); + nvlist_add_string_array(nvl, key, string_arr, 8); ATF_REQUIRE_EQ(nvlist_error(nvl), 0); ATF_REQUIRE(!nvlist_empty(nvl)); ATF_REQUIRE(nvlist_exists_string_array(nvl, key)); @@ -1082,7 +1082,7 @@ ATF_TEST_CASE_BODY(nvlist_string_array__pack) const_result = nvlist_get_string_array(unpacked, key, &count); ATF_REQUIRE_EQ(count, 8); for (i = 0; i < count; i++) { - ATF_REQUIRE_EQ(strcmp(string[i], const_result[i]), 0); + ATF_REQUIRE_EQ(strcmp(string_arr[i], const_result[i]), 0); } nvlist_destroy(nvl);