From 2953ebccba8af26c718deab89bc438870f4cfca8 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 27 Sep 2022 09:08:35 +0200 Subject: [PATCH 1/3] glib-aux: rename nm_utils_array_find_binary_search() to nm_array_bsearch() The "nm_utils_" prefix is just too verbose. Drop it. Also, Posix has a bsearch function. As this function is similar, rename it. Note that currently the arguments are provided in differnt order from bsearch(). That will be partly addressed next. That is the main reason for the rename. The next commit will swap the arguments, so do a rename first to get a compilation error when backporting a patch that uses the changed API. --- src/core/nm-manager.c | 12 ++-- .../plugins/ifcfg-rh/nms-ifcfg-rh-utils.c | 12 ++-- .../nm-supplicant-settings-verify.c | 12 ++-- src/libnm-base/nm-ethtool-base.c | 12 ++-- src/libnm-client-impl/nm-libnm-utils.c | 22 +++---- .../nm-libnm-core-utils.c | 12 ++-- src/libnm-core-impl/nm-keyfile.c | 10 +-- .../nm-meta-setting-base-impl.c | 12 ++-- src/libnm-core-impl/nm-setting-ip-config.c | 12 ++-- src/libnm-core-impl/nm-setting.c | 12 ++-- src/libnm-core-impl/nm-utils.c | 7 +- src/libnm-core-impl/tests/test-general.c | 66 ++++++++----------- src/libnm-glib-aux/nm-shared-utils.c | 50 +++++++------- src/libnm-glib-aux/nm-shared-utils.h | 64 +++++++++--------- .../nm-meta-setting-base-impl.c | 12 ++-- 15 files changed, 158 insertions(+), 169 deletions(-) diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c index ea71af3370..d9bc28e55e 100644 --- a/src/core/nm-manager.c +++ b/src/core/nm-manager.c @@ -7904,12 +7904,12 @@ nm_manager_set_capability(NMManager *self, NMCapability cap) priv = NM_MANAGER_GET_PRIVATE(self); - idx = nm_utils_array_find_binary_search(nm_g_array_index_p(priv->capabilities, guint32, 0), - sizeof(guint32), - priv->capabilities->len, - &cap_i, - nm_cmp_uint32_p_with_data, - NULL); + idx = nm_array_find_bsearch(nm_g_array_index_p(priv->capabilities, guint32, 0), + sizeof(guint32), + priv->capabilities->len, + &cap_i, + nm_cmp_uint32_p_with_data, + NULL); if (idx >= 0) return; diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c index e1ef817478..4d650021c4 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c @@ -1080,12 +1080,12 @@ nms_ifcfg_well_known_key_find_info(const char *key, gssize *out_idx) G_STATIC_ASSERT(G_STRUCT_OFFSET(NMSIfcfgKeyTypeInfo, key_name) == 0); - idx = nm_utils_array_find_binary_search(nms_ifcfg_well_known_keys, - sizeof(nms_ifcfg_well_known_keys[0]), - G_N_ELEMENTS(nms_ifcfg_well_known_keys), - &key, - nm_strcmp_p_with_data, - NULL); + idx = nm_array_find_bsearch(nms_ifcfg_well_known_keys, + sizeof(nms_ifcfg_well_known_keys[0]), + G_N_ELEMENTS(nms_ifcfg_well_known_keys), + &key, + nm_strcmp_p_with_data, + NULL); NM_SET_OUT(out_idx, idx); if (idx < 0) return NULL; diff --git a/src/core/supplicant/nm-supplicant-settings-verify.c b/src/core/supplicant/nm-supplicant-settings-verify.c index 1dc41b3471..aa85ba9984 100644 --- a/src/core/supplicant/nm-supplicant-settings-verify.c +++ b/src/core/supplicant/nm-supplicant-settings-verify.c @@ -279,12 +279,12 @@ nm_supplicant_settings_verify_setting(const char *key, const char *value, const } } - opt_idx = nm_utils_array_find_binary_search(opt_table, - sizeof(opt_table[0]), - G_N_ELEMENTS(opt_table), - &key, - nm_strcmp_p_with_data, - NULL); + opt_idx = nm_array_find_bsearch(opt_table, + sizeof(opt_table[0]), + G_N_ELEMENTS(opt_table), + &key, + nm_strcmp_p_with_data, + NULL); if (opt_idx < 0) { if (nm_streq(key, "mode")) { if (len != 1) diff --git a/src/libnm-base/nm-ethtool-base.c b/src/libnm-base/nm-ethtool-base.c index 99bbe68e32..50cb78f6b5 100644 --- a/src/libnm-base/nm-ethtool-base.c +++ b/src/libnm-base/nm-ethtool-base.c @@ -271,12 +271,12 @@ nm_ethtool_data_get_by_optname(const char *optname) _ASSERT_data(); - idx = nm_utils_array_find_binary_search((gconstpointer *) _by_name, - sizeof(_by_name[0]), - _NM_ETHTOOL_ID_NUM, - optname, - _by_name_cmp, - NULL); + idx = nm_array_find_bsearch((gconstpointer *) _by_name, + sizeof(_by_name[0]), + _NM_ETHTOOL_ID_NUM, + optname, + _by_name_cmp, + NULL); return (idx < 0) ? NULL : nm_ethtool_data[_by_name[idx]]; } diff --git a/src/libnm-client-impl/nm-libnm-utils.c b/src/libnm-client-impl/nm-libnm-utils.c index 6a7c155e76..e67f4c1b6b 100644 --- a/src/libnm-client-impl/nm-libnm-utils.c +++ b/src/libnm-client-impl/nm-libnm-utils.c @@ -752,11 +752,11 @@ nml_dbus_meta_iface_get(const char *dbus_iface_name) if (NM_STR_HAS_PREFIX(dbus_iface_name, COMMON_PREFIX)) { /* optimize, that in fact all our interfaces have the same prefix. */ - idx = nm_utils_ptrarray_find_binary_search((gconstpointer *) _nml_dbus_meta_ifaces, - G_N_ELEMENTS(_nml_dbus_meta_ifaces), - &dbus_iface_name[NM_STRLEN(COMMON_PREFIX)], - _strcmp_common_prefix, - NULL); + idx = nm_ptrarray_find_bsearch((gconstpointer *) _nml_dbus_meta_ifaces, + G_N_ELEMENTS(_nml_dbus_meta_ifaces), + &dbus_iface_name[NM_STRLEN(COMMON_PREFIX)], + _strcmp_common_prefix, + NULL); } else return NULL; @@ -775,12 +775,12 @@ nml_dbus_meta_property_get(const NMLDBusMetaIface *meta_iface, nm_assert(meta_iface); nm_assert(dbus_property_name); - idx = nm_utils_array_find_binary_search(meta_iface->dbus_properties, - sizeof(meta_iface->dbus_properties[0]), - meta_iface->n_dbus_properties, - &dbus_property_name, - nm_strcmp_p_with_data, - NULL); + idx = nm_array_find_bsearch(meta_iface->dbus_properties, + sizeof(meta_iface->dbus_properties[0]), + meta_iface->n_dbus_properties, + &dbus_property_name, + nm_strcmp_p_with_data, + NULL); if (idx < 0) { NM_SET_OUT(out_idx, meta_iface->n_dbus_properties); return NULL; diff --git a/src/libnm-core-aux-intern/nm-libnm-core-utils.c b/src/libnm-core-aux-intern/nm-libnm-core-utils.c index 1febe5dfd8..92e84182e4 100644 --- a/src/libnm-core-aux-intern/nm-libnm-core-utils.c +++ b/src/libnm-core-aux-intern/nm-libnm-core-utils.c @@ -349,12 +349,12 @@ nm_auth_permission_from_string(const char *str) if (!NM_STR_HAS_PREFIX(str, AUTH_PERMISSION_PREFIX)) return NM_CLIENT_PERMISSION_NONE; - idx = nm_utils_array_find_binary_search(nm_auth_permission_sorted, - sizeof(nm_auth_permission_sorted[0]), - G_N_ELEMENTS(nm_auth_permission_sorted), - &str[NM_STRLEN(AUTH_PERMISSION_PREFIX)], - _nm_auth_permission_from_string_cmp, - NULL); + idx = nm_array_find_bsearch(nm_auth_permission_sorted, + sizeof(nm_auth_permission_sorted[0]), + G_N_ELEMENTS(nm_auth_permission_sorted), + &str[NM_STRLEN(AUTH_PERMISSION_PREFIX)], + _nm_auth_permission_from_string_cmp, + NULL); if (idx < 0) return NM_CLIENT_PERMISSION_NONE; return nm_auth_permission_sorted[idx]; diff --git a/src/libnm-core-impl/nm-keyfile.c b/src/libnm-core-impl/nm-keyfile.c index 8201940895..384522c0cf 100644 --- a/src/libnm-core-impl/nm-keyfile.c +++ b/src/libnm-core-impl/nm-keyfile.c @@ -3188,11 +3188,11 @@ _parse_info_find(NMSetting *setting, G_STATIC_ASSERT_EXPR(G_STRUCT_OFFSET(ParseInfoProperty, property_name) == 0); - idx = nm_utils_ptrarray_find_binary_search((gconstpointer *) pis->properties, - NM_PTRARRAY_LEN(pis->properties), - &property_name, - nm_strcmp_p_with_data, - NULL); + idx = nm_ptrarray_find_bsearch((gconstpointer *) pis->properties, + NM_PTRARRAY_LEN(pis->properties), + &property_name, + nm_strcmp_p_with_data, + NULL); if (idx >= 0) pip = pis->properties[idx]; } diff --git a/src/libnm-core-impl/nm-meta-setting-base-impl.c b/src/libnm-core-impl/nm-meta-setting-base-impl.c index 69daa76c9d..f361854dbe 100644 --- a/src/libnm-core-impl/nm-meta-setting-base-impl.c +++ b/src/libnm-core-impl/nm-meta-setting-base-impl.c @@ -693,12 +693,12 @@ nm_meta_setting_infos_by_name(const char *name) } G_STATIC_ASSERT_EXPR(G_STRUCT_OFFSET(NMMetaSettingInfo, setting_name) == 0); - idx = nm_utils_array_find_binary_search(nm_meta_setting_infos, - sizeof(NMMetaSettingInfo), - _NM_META_SETTING_TYPE_NUM, - &name, - nm_strcmp_p_with_data, - NULL); + idx = nm_array_find_bsearch(nm_meta_setting_infos, + sizeof(NMMetaSettingInfo), + _NM_META_SETTING_TYPE_NUM, + &name, + nm_strcmp_p_with_data, + NULL); return idx >= 0 ? &nm_meta_setting_infos[idx] : NULL; } diff --git a/src/libnm-core-impl/nm-setting-ip-config.c b/src/libnm-core-impl/nm-setting-ip-config.c index 5f4fb8bbfd..b6738189d7 100644 --- a/src/libnm-core-impl/nm-setting-ip-config.c +++ b/src/libnm-core-impl/nm-setting-ip-config.c @@ -2934,12 +2934,12 @@ _rr_dbus_attr_from_name(const char *name) } } - idx = nm_utils_array_find_binary_search(rr_dbus_data, - sizeof(rr_dbus_data[0]), - _RR_DBUS_ATTR_NUM, - &name, - nm_strcmp_p_with_data, - NULL); + idx = nm_array_find_bsearch(rr_dbus_data, + sizeof(rr_dbus_data[0]), + _RR_DBUS_ATTR_NUM, + &name, + nm_strcmp_p_with_data, + NULL); if (idx < 0) return _RR_DBUS_ATTR_NUM; return idx; diff --git a/src/libnm-core-impl/nm-setting.c b/src/libnm-core-impl/nm-setting.c index 2f0b338eee..ff07811d8b 100644 --- a/src/libnm-core-impl/nm-setting.c +++ b/src/libnm-core-impl/nm-setting.c @@ -477,12 +477,12 @@ _nm_sett_info_setting_get_property_info(const NMSettInfoSetting *sett_info, return NULL; G_STATIC_ASSERT_EXPR(G_STRUCT_OFFSET(NMSettInfoProperty, name) == 0); - idx = nm_utils_array_find_binary_search(sett_info->property_infos, - sizeof(NMSettInfoProperty), - sett_info->property_infos_len, - &property_name, - nm_strcmp_p_with_data, - NULL); + idx = nm_array_find_bsearch(sett_info->property_infos, + sizeof(NMSettInfoProperty), + sett_info->property_infos_len, + &property_name, + nm_strcmp_p_with_data, + NULL); if (idx < 0) return NULL; diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c index 9a7167f67f..8db96b6d30 100644 --- a/src/libnm-core-impl/nm-utils.c +++ b/src/libnm-core-impl/nm-utils.c @@ -5020,11 +5020,8 @@ _nm_variant_attribute_spec_find_binary_search(const NMVariantAttributeSpec *cons G_STATIC_ASSERT_EXPR(G_STRUCT_OFFSET(NMVariantAttributeSpec, name) == 0); - idx = nm_utils_ptrarray_find_binary_search((gconstpointer *) array, - len, - &name, - nm_strcmp_p_with_data, - NULL); + idx = + nm_ptrarray_find_bsearch((gconstpointer *) array, len, &name, nm_strcmp_p_with_data, NULL); if (idx < 0) return NULL; return array[idx]; diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c index 83cd3ed9da..e8767bba05 100644 --- a/src/libnm-core-impl/tests/test-general.c +++ b/src/libnm-core-impl/tests/test-general.c @@ -8784,19 +8784,15 @@ _test_find_binary_search_do(const int *array, gsize len) expected_result = nm_utils_ptrarray_find_first(parray, len, pneedle); - idx = nm_utils_ptrarray_find_binary_search_range(parray, - len, - pneedle, - _test_find_binary_search_cmp, - NULL, - &idx_first, - &idx_last); + idx = nm_ptrarray_find_bsearch_range(parray, + len, + pneedle, + _test_find_binary_search_cmp, + NULL, + &idx_first, + &idx_last); - idx2 = nm_utils_ptrarray_find_binary_search(parray, - len, - pneedle, - _test_find_binary_search_cmp, - NULL); + idx2 = nm_ptrarray_find_bsearch(parray, len, pneedle, _test_find_binary_search_cmp, NULL); g_assert_cmpint(idx, ==, idx2); if (expected_result >= 0) { @@ -8861,12 +8857,12 @@ _test_find_binary_search_do_uint32(const int *int_array, gsize len) expected_result = idx; } - idx = nm_utils_array_find_binary_search(array, - sizeof(guint32), - len, - &NEEDLE, - nm_cmp_uint32_p_with_data, - NULL); + idx = nm_array_find_bsearch(array, + sizeof(guint32), + len, + &NEEDLE, + nm_cmp_uint32_p_with_data, + NULL); if (expected_result >= 0) g_assert_cmpint(expected_result, ==, idx); else { @@ -8960,29 +8956,25 @@ test_nm_utils_ptrarray_find_binary_search_with_duplicates(void) for (i = 0; i < i_len + BIN_SEARCH_W_DUPS_JITTER; i++) { gconstpointer p = GINT_TO_POINTER(i); - idx = nm_utils_ptrarray_find_binary_search_range(arr, - i_len, - p, - _test_bin_search2_cmp, - NULL, - &idx_first, - &idx_last); + idx = nm_ptrarray_find_bsearch_range(arr, + i_len, + p, + _test_bin_search2_cmp, + NULL, + &idx_first, + &idx_last); idx_first2 = nm_utils_ptrarray_find_first(arr, i_len, p); - idx2 = nm_utils_array_find_binary_search(arr, - sizeof(gpointer), - i_len, - &p, - _test_bin_search2_cmp_p, - NULL); + idx2 = nm_array_find_bsearch(arr, + sizeof(gpointer), + i_len, + &p, + _test_bin_search2_cmp_p, + NULL); g_assert_cmpint(idx, ==, idx2); - idx2 = nm_utils_ptrarray_find_binary_search(arr, - i_len, - p, - _test_bin_search2_cmp, - NULL); + idx2 = nm_ptrarray_find_bsearch(arr, i_len, p, _test_bin_search2_cmp, NULL); g_assert_cmpint(idx, ==, idx2); if (idx_first2 < 0) { @@ -11254,7 +11246,7 @@ main(int argc, char **argv) g_test_add_func("/core/general/_nm_utils_ascii_str_to_int64", test_nm_utils_ascii_str_to_int64); g_test_add_func("/core/general/nm_utils_is_power_of_two", test_nm_utils_is_power_of_two); - g_test_add_func("/core/general/nm_utils_ptrarray_find_binary_search_range", + g_test_add_func("/core/general/nm_ptrarray_find_bsearch_range", test_nm_utils_ptrarray_find_binary_search); g_test_add_func("/core/general/nm_utils_ptrarray_find_binary_search_with_duplicates", test_nm_utils_ptrarray_find_binary_search_with_duplicates); diff --git a/src/libnm-glib-aux/nm-shared-utils.c b/src/libnm-glib-aux/nm-shared-utils.c index 524f0c31b1..d98489f18c 100644 --- a/src/libnm-glib-aux/nm-shared-utils.c +++ b/src/libnm-glib-aux/nm-shared-utils.c @@ -3093,12 +3093,12 @@ nm_utils_named_value_list_find(const NMUtilsNamedValue *arr, #endif if (sorted) { - return nm_utils_array_find_binary_search(arr, - sizeof(NMUtilsNamedValue), - len, - &name, - nm_strcmp_p_with_data, - NULL); + return nm_array_find_bsearch(arr, + sizeof(NMUtilsNamedValue), + len, + &name, + nm_strcmp_p_with_data, + NULL); } for (i = 0; i < len; i++) { if (nm_streq(arr[i].name, name)) @@ -3786,11 +3786,11 @@ nm_utils_ptrarray_is_sorted(gconstpointer *list, } gssize -nm_utils_ptrarray_find_binary_search(gconstpointer *list, - gsize len, - gconstpointer needle, - GCompareDataFunc cmpfcn, - gpointer user_data) +nm_ptrarray_find_bsearch(gconstpointer *list, + gsize len, + gconstpointer needle, + GCompareDataFunc cmpfcn, + gpointer user_data) { gssize imin, imax, imid; int cmp; @@ -3823,13 +3823,13 @@ nm_utils_ptrarray_find_binary_search(gconstpointer *list, } gssize -nm_utils_ptrarray_find_binary_search_range(gconstpointer *list, - gsize len, - gconstpointer needle, - GCompareDataFunc cmpfcn, - gpointer user_data, - gssize *out_idx_first, - gssize *out_idx_last) +nm_ptrarray_find_bsearch_range(gconstpointer *list, + gsize len, + gconstpointer needle, + GCompareDataFunc cmpfcn, + gpointer user_data, + gssize *out_idx_first, + gssize *out_idx_last) { gssize imin, imax, imid, i2min, i2max, i2mid; int cmp; @@ -3904,7 +3904,7 @@ nm_utils_ptrarray_find_binary_search_range(gconstpointer *list, /*****************************************************************************/ /** - * nm_utils_array_find_binary_search: + * nm_array_find_bsearch: * @list: the list to search. It must be sorted according to @cmpfcn ordering. * @elem_size: the size in bytes of each element in the list * @len: the number of elements in @list @@ -3928,12 +3928,12 @@ nm_utils_ptrarray_find_binary_search_range(gconstpointer *list, * position where it should be. */ gssize -nm_utils_array_find_binary_search(gconstpointer list, - gsize elem_size, - gsize len, - gconstpointer needle, - GCompareDataFunc cmpfcn, - gpointer user_data) +nm_array_find_bsearch(gconstpointer list, + gsize elem_size, + gsize len, + gconstpointer needle, + GCompareDataFunc cmpfcn, + gpointer user_data) { gssize imin, imax, imid; int cmp; diff --git a/src/libnm-glib-aux/nm-shared-utils.h b/src/libnm-glib-aux/nm-shared-utils.h index 5da489b273..cb2c9d8557 100644 --- a/src/libnm-glib-aux/nm-shared-utils.h +++ b/src/libnm-glib-aux/nm-shared-utils.h @@ -2103,42 +2103,42 @@ gboolean nm_utils_ptrarray_is_sorted(gconstpointer *list, GCompareDataFunc cmpfcn, gpointer user_data); -gssize nm_utils_ptrarray_find_binary_search(gconstpointer *list, - gsize len, - gconstpointer needle, - GCompareDataFunc cmpfcn, - gpointer user_data); +gssize nm_ptrarray_find_bsearch(gconstpointer *list, + gsize len, + gconstpointer needle, + GCompareDataFunc cmpfcn, + gpointer user_data); -gssize nm_utils_ptrarray_find_binary_search_range(gconstpointer *list, - gsize len, - gconstpointer needle, - GCompareDataFunc cmpfcn, - gpointer user_data, - gssize *out_idx_first, - gssize *out_idx_last); +gssize nm_ptrarray_find_bsearch_range(gconstpointer *list, + gsize len, + gconstpointer needle, + GCompareDataFunc cmpfcn, + gpointer user_data, + gssize *out_idx_first, + gssize *out_idx_last); -#define nm_strv_find_binary_search(strv, len, needle) \ - ({ \ - const char *const *const _strv = NM_CAST_STRV_CC(strv); \ - const gsize _len = (len); \ - const char *const _needle = (needle); \ - \ - nm_assert(_len == 0 || _strv); \ - nm_assert(_needle); \ - \ - nm_utils_ptrarray_find_binary_search((gconstpointer *) _strv, \ - _len, \ - _needle, \ - nm_strcmp_with_data, \ - NULL); \ +#define nm_strv_find_binary_search(strv, len, needle) \ + ({ \ + const char *const *const _strv = NM_CAST_STRV_CC(strv); \ + const gsize _len = (len); \ + const char *const _needle = (needle); \ + \ + nm_assert(_len == 0 || _strv); \ + nm_assert(_needle); \ + \ + nm_ptrarray_find_bsearch((gconstpointer *) _strv, \ + _len, \ + _needle, \ + nm_strcmp_with_data, \ + NULL); \ }) -gssize nm_utils_array_find_binary_search(gconstpointer list, - gsize elem_size, - gsize len, - gconstpointer needle, - GCompareDataFunc cmpfcn, - gpointer user_data); +gssize nm_array_find_bsearch(gconstpointer list, + gsize elem_size, + gsize len, + gconstpointer needle, + GCompareDataFunc cmpfcn, + gpointer user_data); gssize nm_utils_ptrarray_find_first(gconstpointer *list, gssize len, gconstpointer needle); diff --git a/src/libnmc-setting/nm-meta-setting-base-impl.c b/src/libnmc-setting/nm-meta-setting-base-impl.c index 69daa76c9d..f361854dbe 100644 --- a/src/libnmc-setting/nm-meta-setting-base-impl.c +++ b/src/libnmc-setting/nm-meta-setting-base-impl.c @@ -693,12 +693,12 @@ nm_meta_setting_infos_by_name(const char *name) } G_STATIC_ASSERT_EXPR(G_STRUCT_OFFSET(NMMetaSettingInfo, setting_name) == 0); - idx = nm_utils_array_find_binary_search(nm_meta_setting_infos, - sizeof(NMMetaSettingInfo), - _NM_META_SETTING_TYPE_NUM, - &name, - nm_strcmp_p_with_data, - NULL); + idx = nm_array_find_bsearch(nm_meta_setting_infos, + sizeof(NMMetaSettingInfo), + _NM_META_SETTING_TYPE_NUM, + &name, + nm_strcmp_p_with_data, + NULL); return idx >= 0 ? &nm_meta_setting_infos[idx] : NULL; } From f786b054799c6bf8cd349f0780e9775e50ad4690 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 27 Sep 2022 09:14:30 +0200 Subject: [PATCH 2/3] glib-aux: swap arguments for nm_array_find_bsearch() Have "len" before "elem_size". That is consistent with g_qsort_with_data() and bsearch(), and is also what I would expect. Note that the previous commit just renamed the function. If a user of the new, changed API gets backported to an older branch, we will get a compilation error and note that the arguments need to be adjusted. --- src/core/nm-manager.c | 2 +- src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c | 2 +- src/core/supplicant/nm-supplicant-settings-verify.c | 2 +- src/libnm-base/nm-ethtool-base.c | 2 +- src/libnm-client-impl/nm-libnm-utils.c | 2 +- src/libnm-core-aux-intern/nm-libnm-core-utils.c | 2 +- src/libnm-core-impl/nm-meta-setting-base-impl.c | 2 +- src/libnm-core-impl/nm-setting-ip-config.c | 2 +- src/libnm-core-impl/nm-setting.c | 2 +- src/libnm-core-impl/tests/test-general.c | 4 ++-- src/libnm-glib-aux/nm-shared-utils.c | 6 +++--- src/libnm-glib-aux/nm-shared-utils.h | 2 +- src/libnmc-setting/nm-meta-setting-base-impl.c | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c index d9bc28e55e..1197e2c98c 100644 --- a/src/core/nm-manager.c +++ b/src/core/nm-manager.c @@ -7905,8 +7905,8 @@ nm_manager_set_capability(NMManager *self, NMCapability cap) priv = NM_MANAGER_GET_PRIVATE(self); idx = nm_array_find_bsearch(nm_g_array_index_p(priv->capabilities, guint32, 0), - sizeof(guint32), priv->capabilities->len, + sizeof(guint32), &cap_i, nm_cmp_uint32_p_with_data, NULL); diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c index 4d650021c4..3bf9f7df47 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c @@ -1081,8 +1081,8 @@ nms_ifcfg_well_known_key_find_info(const char *key, gssize *out_idx) G_STATIC_ASSERT(G_STRUCT_OFFSET(NMSIfcfgKeyTypeInfo, key_name) == 0); idx = nm_array_find_bsearch(nms_ifcfg_well_known_keys, - sizeof(nms_ifcfg_well_known_keys[0]), G_N_ELEMENTS(nms_ifcfg_well_known_keys), + sizeof(nms_ifcfg_well_known_keys[0]), &key, nm_strcmp_p_with_data, NULL); diff --git a/src/core/supplicant/nm-supplicant-settings-verify.c b/src/core/supplicant/nm-supplicant-settings-verify.c index aa85ba9984..08a3553fc7 100644 --- a/src/core/supplicant/nm-supplicant-settings-verify.c +++ b/src/core/supplicant/nm-supplicant-settings-verify.c @@ -280,8 +280,8 @@ nm_supplicant_settings_verify_setting(const char *key, const char *value, const } opt_idx = nm_array_find_bsearch(opt_table, - sizeof(opt_table[0]), G_N_ELEMENTS(opt_table), + sizeof(opt_table[0]), &key, nm_strcmp_p_with_data, NULL); diff --git a/src/libnm-base/nm-ethtool-base.c b/src/libnm-base/nm-ethtool-base.c index 50cb78f6b5..db77651ac5 100644 --- a/src/libnm-base/nm-ethtool-base.c +++ b/src/libnm-base/nm-ethtool-base.c @@ -272,8 +272,8 @@ nm_ethtool_data_get_by_optname(const char *optname) _ASSERT_data(); idx = nm_array_find_bsearch((gconstpointer *) _by_name, - sizeof(_by_name[0]), _NM_ETHTOOL_ID_NUM, + sizeof(_by_name[0]), optname, _by_name_cmp, NULL); diff --git a/src/libnm-client-impl/nm-libnm-utils.c b/src/libnm-client-impl/nm-libnm-utils.c index e67f4c1b6b..f773c7f81d 100644 --- a/src/libnm-client-impl/nm-libnm-utils.c +++ b/src/libnm-client-impl/nm-libnm-utils.c @@ -776,8 +776,8 @@ nml_dbus_meta_property_get(const NMLDBusMetaIface *meta_iface, nm_assert(dbus_property_name); idx = nm_array_find_bsearch(meta_iface->dbus_properties, - sizeof(meta_iface->dbus_properties[0]), meta_iface->n_dbus_properties, + sizeof(meta_iface->dbus_properties[0]), &dbus_property_name, nm_strcmp_p_with_data, NULL); diff --git a/src/libnm-core-aux-intern/nm-libnm-core-utils.c b/src/libnm-core-aux-intern/nm-libnm-core-utils.c index 92e84182e4..b76ff0fa3d 100644 --- a/src/libnm-core-aux-intern/nm-libnm-core-utils.c +++ b/src/libnm-core-aux-intern/nm-libnm-core-utils.c @@ -350,8 +350,8 @@ nm_auth_permission_from_string(const char *str) if (!NM_STR_HAS_PREFIX(str, AUTH_PERMISSION_PREFIX)) return NM_CLIENT_PERMISSION_NONE; idx = nm_array_find_bsearch(nm_auth_permission_sorted, - sizeof(nm_auth_permission_sorted[0]), G_N_ELEMENTS(nm_auth_permission_sorted), + sizeof(nm_auth_permission_sorted[0]), &str[NM_STRLEN(AUTH_PERMISSION_PREFIX)], _nm_auth_permission_from_string_cmp, NULL); diff --git a/src/libnm-core-impl/nm-meta-setting-base-impl.c b/src/libnm-core-impl/nm-meta-setting-base-impl.c index f361854dbe..ebc04556a7 100644 --- a/src/libnm-core-impl/nm-meta-setting-base-impl.c +++ b/src/libnm-core-impl/nm-meta-setting-base-impl.c @@ -694,8 +694,8 @@ nm_meta_setting_infos_by_name(const char *name) G_STATIC_ASSERT_EXPR(G_STRUCT_OFFSET(NMMetaSettingInfo, setting_name) == 0); idx = nm_array_find_bsearch(nm_meta_setting_infos, - sizeof(NMMetaSettingInfo), _NM_META_SETTING_TYPE_NUM, + sizeof(NMMetaSettingInfo), &name, nm_strcmp_p_with_data, NULL); diff --git a/src/libnm-core-impl/nm-setting-ip-config.c b/src/libnm-core-impl/nm-setting-ip-config.c index b6738189d7..a1bdbe364b 100644 --- a/src/libnm-core-impl/nm-setting-ip-config.c +++ b/src/libnm-core-impl/nm-setting-ip-config.c @@ -2935,8 +2935,8 @@ _rr_dbus_attr_from_name(const char *name) } idx = nm_array_find_bsearch(rr_dbus_data, - sizeof(rr_dbus_data[0]), _RR_DBUS_ATTR_NUM, + sizeof(rr_dbus_data[0]), &name, nm_strcmp_p_with_data, NULL); diff --git a/src/libnm-core-impl/nm-setting.c b/src/libnm-core-impl/nm-setting.c index ff07811d8b..7086a60bc0 100644 --- a/src/libnm-core-impl/nm-setting.c +++ b/src/libnm-core-impl/nm-setting.c @@ -478,8 +478,8 @@ _nm_sett_info_setting_get_property_info(const NMSettInfoSetting *sett_info, G_STATIC_ASSERT_EXPR(G_STRUCT_OFFSET(NMSettInfoProperty, name) == 0); idx = nm_array_find_bsearch(sett_info->property_infos, - sizeof(NMSettInfoProperty), sett_info->property_infos_len, + sizeof(NMSettInfoProperty), &property_name, nm_strcmp_p_with_data, NULL); diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c index e8767bba05..0a47890f1f 100644 --- a/src/libnm-core-impl/tests/test-general.c +++ b/src/libnm-core-impl/tests/test-general.c @@ -8858,8 +8858,8 @@ _test_find_binary_search_do_uint32(const int *int_array, gsize len) } idx = nm_array_find_bsearch(array, - sizeof(guint32), len, + sizeof(guint32), &NEEDLE, nm_cmp_uint32_p_with_data, NULL); @@ -8967,8 +8967,8 @@ test_nm_utils_ptrarray_find_binary_search_with_duplicates(void) idx_first2 = nm_utils_ptrarray_find_first(arr, i_len, p); idx2 = nm_array_find_bsearch(arr, - sizeof(gpointer), i_len, + sizeof(gpointer), &p, _test_bin_search2_cmp_p, NULL); diff --git a/src/libnm-glib-aux/nm-shared-utils.c b/src/libnm-glib-aux/nm-shared-utils.c index d98489f18c..6f56a4fe95 100644 --- a/src/libnm-glib-aux/nm-shared-utils.c +++ b/src/libnm-glib-aux/nm-shared-utils.c @@ -3094,8 +3094,8 @@ nm_utils_named_value_list_find(const NMUtilsNamedValue *arr, if (sorted) { return nm_array_find_bsearch(arr, - sizeof(NMUtilsNamedValue), len, + sizeof(NMUtilsNamedValue), &name, nm_strcmp_p_with_data, NULL); @@ -3906,8 +3906,8 @@ nm_ptrarray_find_bsearch_range(gconstpointer *list, /** * nm_array_find_bsearch: * @list: the list to search. It must be sorted according to @cmpfcn ordering. - * @elem_size: the size in bytes of each element in the list * @len: the number of elements in @list + * @elem_size: the size in bytes of each element in the list * @needle: the value that is searched * @cmpfcn: the compare function. The elements @list are passed as first * argument to @cmpfcn, while @needle is passed as second. Usually, the @@ -3929,8 +3929,8 @@ nm_ptrarray_find_bsearch_range(gconstpointer *list, */ gssize nm_array_find_bsearch(gconstpointer list, - gsize elem_size, gsize len, + gsize elem_size, gconstpointer needle, GCompareDataFunc cmpfcn, gpointer user_data) diff --git a/src/libnm-glib-aux/nm-shared-utils.h b/src/libnm-glib-aux/nm-shared-utils.h index cb2c9d8557..3d32f0d21a 100644 --- a/src/libnm-glib-aux/nm-shared-utils.h +++ b/src/libnm-glib-aux/nm-shared-utils.h @@ -2134,8 +2134,8 @@ gssize nm_ptrarray_find_bsearch_range(gconstpointer *list, }) gssize nm_array_find_bsearch(gconstpointer list, - gsize elem_size, gsize len, + gsize elem_size, gconstpointer needle, GCompareDataFunc cmpfcn, gpointer user_data); diff --git a/src/libnmc-setting/nm-meta-setting-base-impl.c b/src/libnmc-setting/nm-meta-setting-base-impl.c index f361854dbe..ebc04556a7 100644 --- a/src/libnmc-setting/nm-meta-setting-base-impl.c +++ b/src/libnmc-setting/nm-meta-setting-base-impl.c @@ -694,8 +694,8 @@ nm_meta_setting_infos_by_name(const char *name) G_STATIC_ASSERT_EXPR(G_STRUCT_OFFSET(NMMetaSettingInfo, setting_name) == 0); idx = nm_array_find_bsearch(nm_meta_setting_infos, - sizeof(NMMetaSettingInfo), _NM_META_SETTING_TYPE_NUM, + sizeof(NMMetaSettingInfo), &name, nm_strcmp_p_with_data, NULL); From efcc03075218fe9f8ee14067b670a43f74363328 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 27 Sep 2022 09:45:35 +0200 Subject: [PATCH 3/3] std-aux/trivial: fix typo in code comment --- src/libnm-std-aux/nm-std-aux.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libnm-std-aux/nm-std-aux.h b/src/libnm-std-aux/nm-std-aux.h index 95724252cb..eb16524b88 100644 --- a/src/libnm-std-aux/nm-std-aux.h +++ b/src/libnm-std-aux/nm-std-aux.h @@ -507,7 +507,7 @@ nm_memeq(const void *s1, const void *s2, size_t len) /* * Very similar to g_str_has_prefix() with the obvious meaning. * Differences: - * 1) suffix is enforced to be a C string literal + * 1) prefix is enforced to be a C string literal * (it is thus more restricted, but you'll know it at compile time). * 2) it accepts str==NULL * (it is thus more forgiving than g_str_has_prefix())