fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 08:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: only check once for valid static array in valid_s390_opts_check()

Browse source 
No need to check every time. The buffer is a const global buffer,
so checking it once is enough.
This commit is contained in:
Thomas Haller 2021-03-15 14:34:25 +01:00
parent 80c98b60da
commit b9d73cfb2d
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/libnm-core-impl/nm-setting-wired.c
View file

@ -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,