colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glib-aux/prioq: refactor find_item() in NMPrioq

Browse Source
This commit is contained in:
Thomas Haller
2023-03-10 19:18:37 +01:00
parent 46703557fb
commit 78489e7cbb
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/libnm-glib-aux/nm-prioq.c
View File

@@ -278,26 +278,28 @@ find_item(NMPrioq *q, void *data, unsigned *idx)
_nm_assert_q(q);
if (q->_priv.n_items <= 0)
return NULL;
if (idx) {
if (*idx == NM_PRIOQ_IDX_NULL || *idx >= q->_priv.n_items)
return NULL;
i = &q->_priv.items[*idx];
if (i->data == data)
return i;
} else {
if (G_UNLIKELY(!idx)) {
/* We allow using NMPrioq without "idx". In that case, it does a linear
* search for the data. */
for (i = q->_priv.items; i < &q->_priv.items[q->_priv.n_items]; i++) {
if (i->data == data)
return i;
}
return NULL;
}
if (*idx >= q->_priv.n_items) {
return NULL;
}
i = &q->_priv.items[*idx];
if (i->data != data)
return NULL;
return i;
}
gboolean
nm_prioq_remove(NMPrioq *q, void *data, unsigned *idx)
{