diff options
author | Thomas Haller <thaller@redhat.com> | 2023-03-10 17:32:15 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2023-03-21 15:58:37 +0100 |
commit | f701ff28e8cf0b7cb89116c2aefa1fca4bafc33b (patch) | |
tree | f8ad7540681eefb46604ae1308d574ff549a9531 | |
parent | 68ccc46b04b1db87c9cf48d7af817041a8c18a0a (diff) |
glib-aux/prioq: add and use internal PrioqItem typedef
Seems nicer to read.
-rw-r--r-- | src/libnm-glib-aux/nm-prioq.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/libnm-glib-aux/nm-prioq.c b/src/libnm-glib-aux/nm-prioq.c index 4b77ec6f10..3340269482 100644 --- a/src/libnm-glib-aux/nm-prioq.c +++ b/src/libnm-glib-aux/nm-prioq.c @@ -21,10 +21,10 @@ /*****************************************************************************/ -struct _NMPrioqItem { +typedef struct _NMPrioqItem { void *data; unsigned *idx; -}; +} PrioqItem; /*****************************************************************************/ @@ -188,12 +188,12 @@ nm_prioq_put(NMPrioq *q, void *data, unsigned *idx) if (q->_priv.n_items >= q->_priv.n_allocated) { q->_priv.n_allocated = NM_MAX((q->_priv.n_items + 1u) * 2u, 16u); - q->_priv.items = g_renew(struct _NMPrioqItem, q->_priv.items, q->_priv.n_allocated); + q->_priv.items = g_renew(PrioqItem, q->_priv.items, q->_priv.n_allocated); } k = q->_priv.n_items++; - q->_priv.items[k] = (struct _NMPrioqItem){ + q->_priv.items[k] = (PrioqItem){ .data = data, .idx = idx, }; @@ -204,10 +204,10 @@ nm_prioq_put(NMPrioq *q, void *data, unsigned *idx) } static void -remove_item(NMPrioq *q, struct _NMPrioqItem *i) +remove_item(NMPrioq *q, PrioqItem *i) { - struct _NMPrioqItem *l; - unsigned k; + PrioqItem *l; + unsigned k; nm_assert(q); nm_assert(i); @@ -236,10 +236,10 @@ remove_item(NMPrioq *q, struct _NMPrioqItem *i) shuffle_up(q, k); } -_nm_pure static struct _NMPrioqItem * +_nm_pure static PrioqItem * find_item(NMPrioq *q, void *data, unsigned *idx) { - struct _NMPrioqItem *i; + PrioqItem *i; nm_assert(q); @@ -266,7 +266,7 @@ find_item(NMPrioq *q, void *data, unsigned *idx) gboolean nm_prioq_remove(NMPrioq *q, void *data, unsigned *idx) { - struct _NMPrioqItem *i; + PrioqItem *i; nm_assert(q); @@ -279,7 +279,7 @@ nm_prioq_remove(NMPrioq *q, void *data, unsigned *idx) } static void -reshuffle_item(NMPrioq *q, struct _NMPrioqItem *i) +reshuffle_item(NMPrioq *q, PrioqItem *i) { unsigned k; @@ -291,7 +291,7 @@ reshuffle_item(NMPrioq *q, struct _NMPrioqItem *i) gboolean nm_prioq_reshuffle(NMPrioq *q, void *data, unsigned *idx) { - struct _NMPrioqItem *i; + PrioqItem *i; nm_assert(q); @@ -306,7 +306,7 @@ nm_prioq_reshuffle(NMPrioq *q, void *data, unsigned *idx) void nm_prioq_update(NMPrioq *q, void *data, unsigned *idx, bool queued /* or else remove */) { - struct _NMPrioqItem *i; + PrioqItem *i; nm_assert(q); |