system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 10:46:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

glib-aux: use nm_assert() in nm_{ptr,}array_find_bsearch()

Browse source 
These checks don't seem very useful, to have them enabled
in production code.

What is actually the real danger of messing up with binary search,
is that the input array is not properly sorted. Asserting for that
would be way more useful, but also likely too expensive to be worth
it.

Checking that the input arguments are not NULL/zero, is not that useful,
because we "usually" won't make such mistakes.

While at it, declare each local variable on a separate line.
This commit is contained in:
Thomas Haller 2022-10-07 11:17:49 +02:00
parent 1656d82045
commit 1c76fe418b
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/libnm-glib-aux/nm-shared-utils.c
View file

@ -3793,11 +3793,13 @@ nm_ptrarray_find_bsearch(gconstpointer *list,
GCompareDataFunc cmpfcn,
gpointer user_data)
{
gssize imin, imax, imid;
gssize imax;
gssize imid;
gssize imin;
int cmp;
g_return_val_if_fail(list || !len, ~((gssize) 0));
g_return_val_if_fail(cmpfcn, ~((gssize) 0));
nm_assert(list || len == 0);
nm_assert(cmpfcn);
imin = 0;
if (len > 0) {
@ -3832,11 +3834,16 @@ nm_ptrarray_find_bsearch_range(gconstpointer *list,
gssize *out_idx_first,
gssize *out_idx_last)
{
gssize imin, imax, imid, i2min, i2max, i2mid;
gssize imax;
gssize imid;
gssize imin;
gssize i2max;
gssize i2mid;
gssize i2min;
int cmp;
g_return_val_if_fail(list || !len, ~((gssize) 0));
g_return_val_if_fail(cmpfcn, ~((gssize) 0));
nm_assert(list || len == 0);
nm_assert(cmpfcn);
imin = 0;
if (len > 0) {
@ -3936,12 +3943,14 @@ nm_array_find_bsearch(gconstpointer list,
GCompareDataFunc cmpfcn,
gpointer user_data)
{
gssize imin, imax, imid;
gssize imax;
gssize imid;
gssize imin;
int cmp;
g_return_val_if_fail(list || !len, ~((gssize) 0));
g_return_val_if_fail(cmpfcn, ~((gssize) 0));
g_return_val_if_fail(elem_size > 0, ~((gssize) 0));
nm_assert(list || len == 0);
nm_assert(cmpfcn);
nm_assert(elem_size > 0);
imin = 0;
if (len == 0)