From b9d73cfb2db8de0d3c400e63fce68cc80c50a1d0 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 15 Mar 2021 14:34:25 +0100 Subject: [PATCH] libnm: only check once for valid static array in valid_s390_opts_check() No need to check every time. The buffer is a const global buffer, so checking it once is enough. --- src/libnm-core-impl/nm-setting-wired.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/libnm-core-impl/nm-setting-wired.c b/src/libnm-core-impl/nm-setting-wired.c index 2bd123450b..834a4ec54c 100644 --- a/src/libnm-core-impl/nm-setting-wired.c +++ b/src/libnm-core-impl/nm-setting-wired.c @@ -111,23 +111,22 @@ static const char *const valid_s390_opts[] = { static gboolean valid_s390_opts_check(const char *option) { -#if NM_MORE_ASSERTS > 5 - nm_assert(NM_PTRARRAY_LEN(valid_s390_opts) + 1 == G_N_ELEMENTS(valid_s390_opts)); - { + if (NM_MORE_ASSERT_ONCE(10)) { gsize i; + nm_assert(NM_PTRARRAY_LEN(valid_s390_opts) + 1u == G_N_ELEMENTS(valid_s390_opts)); + for (i = 0; i < G_N_ELEMENTS(valid_s390_opts); i++) { - if (i == G_N_ELEMENTS(valid_s390_opts) - 1) + if (i == G_N_ELEMENTS(valid_s390_opts) - 1u) nm_assert(!valid_s390_opts[i]); else { nm_assert(valid_s390_opts[i]); nm_assert(valid_s390_opts[i][0] != '\0'); if (i > 0) - g_assert(strcmp(valid_s390_opts[i - 1], valid_s390_opts[i]) < 0); + nm_assert(strcmp(valid_s390_opts[i - 1], valid_s390_opts[i]) < 0); } } } -#endif return option && (nm_utils_array_find_binary_search(valid_s390_opts,