commit 98089e8145b2b3e6ff081b1c39558a1b97b4eb95
Author: Eugene Syromiatnikov <esyr@openssl.org>
Date: Tue Aug 11 14:59:31 2026 +0200
Re-format code after TypenameMacros and ForEachMacros additions
Re-formatting was done using the following command:
for i in `git grep -l 'OSSL_LIST\|PRIORITY_QUEUE_OF\|SPARSE_ARRAY_OF' \
-- '*.c' '*.h' '*.c.in' '*.h.in'`; do \
clang-format-21 --style=file:.clang-format -i "$i"; \
done
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Milan Broz <mbroz@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Merge-date: Thu Sep 24 09:01:06 2026
Merged-from: https://github.com/openssl/openssl/pull/32304
diff --git a/crypto/property/property.c b/crypto/property/property.c
index fab33b0545..80f657f2be 100644
--- a/crypto/property/property.c
+++ b/crypto/property/property.c
@@ -72,7 +72,7 @@ typedef struct {
} ALGORITHM;
typedef struct {
- SPARSE_ARRAY_OF(ALGORITHM) * algs;
+ SPARSE_ARRAY_OF(ALGORITHM) *algs;
QUERY *cache_lists[MAX_CACHE_LINES];
QUERY *archive;
diff --git a/crypto/threads_common.c b/crypto/threads_common.c
index 52b4d76c5a..04f9cd34e4 100644
--- a/crypto/threads_common.c
+++ b/crypto/threads_common.c
@@ -123,7 +123,7 @@ DEFINE_SPARSE_ARRAY_OF(CTX_TABLE_ENTRY);
*
*/
typedef struct master_key_entry {
- SPARSE_ARRAY_OF(CTX_TABLE_ENTRY) * ctx_table;
+ SPARSE_ARRAY_OF(CTX_TABLE_ENTRY) *ctx_table;
} MASTER_KEY_ENTRY;
/**
diff --git a/demos/quic/poll-server/quic-server-ssl-poll-http.c b/demos/quic/poll-server/quic-server-ssl-poll-http.c
index 4a877461de..043d9da012 100644
--- a/demos/quic/poll-server/quic-server-ssl-poll-http.c
+++ b/demos/quic/poll-server/quic-server-ssl-poll-http.c
@@ -1018,8 +1018,7 @@ rebuild_poll_set(struct poll_manager *pm)
i = 0;
DPRINTF(stderr, "%s there %zu events to poll\n", __func__,
ossl_list_pe_num(&pm->pm_head));
- OSSL_LIST_FOREACH(pe, pe, &pm->pm_head)
- {
+ OSSL_LIST_FOREACH (pe, pe, &pm->pm_head) {
pe->pe_poll_item.events = pe->pe_want_events;
pm->pm_poll_set[i++] = *pe;
DPRINTF(stderr, "\t%p (%s) " POLL_FMT " (disabled: " POLL_FMT ")\n",
@@ -1041,8 +1040,8 @@ destroy_poll_manager(struct poll_manager *pm)
if (pm == NULL)
return;
- OSSL_LIST_FOREACH_DELSAFE(pe, pe_safe, pe, &pm->pm_head)
- destroy_pe(pe);
+ OSSL_LIST_FOREACH_DELSAFE (pe, pe_safe, pe, &pm->pm_head)
+ destroy_pe(pe);
OPENSSL_free(pm->pm_poll_set);
OPENSSL_free(pm);
@@ -1625,14 +1624,12 @@ app_destroy_qconn(struct poll_event *pe)
if (pec == NULL)
return;
- OSSL_LIST_FOREACH_DELSAFE(peccx, peccx_save, peccx, &pec->pec_unistream_cx)
- {
+ OSSL_LIST_FOREACH_DELSAFE (peccx, peccx_save, peccx, &pec->pec_unistream_cx) {
peccx->peccx_cb_ondestroy(peccx->peccx);
OPENSSL_free(peccx);
}
- OSSL_LIST_FOREACH_DELSAFE(peccx, peccx_save, peccx, &pec->pec_stream_cx)
- {
+ OSSL_LIST_FOREACH_DELSAFE (peccx, peccx_save, peccx, &pec->pec_stream_cx) {
peccx->peccx_cb_ondestroy(peccx->peccx);
OPENSSL_free(peccx);
}
diff --git a/include/crypto/sparse_array.h b/include/crypto/sparse_array.h
index 44c1a98afb..e8de36a1f0 100644
--- a/include/crypto/sparse_array.h
+++ b/include/crypto/sparse_array.h
@@ -20,74 +20,74 @@ extern "C" {
#define SPARSE_ARRAY_OF(type) struct sparse_array_st_##type
-#define DEFINE_SPARSE_ARRAY_OF_INTERNAL(type, ctype) \
- SPARSE_ARRAY_OF(type); \
- typedef void (*sa_##type##_leaffunc)(ossl_uintmax_t idx, type *t); \
- typedef void (*sa_##type##_leaffunc_arg)(ossl_uintmax_t idx, type *t, void *arg); \
- static ossl_unused ossl_inline SPARSE_ARRAY_OF(type) * ossl_sa_##type##_new(void) \
- { \
- return (SPARSE_ARRAY_OF(type) *)ossl_sa_new(); \
- } \
- static ossl_unused ossl_inline void \
- ossl_sa_##type##_free(SPARSE_ARRAY_OF(type) * sa) \
- { \
- ossl_sa_free((OPENSSL_SA *)sa); \
- } \
- static ossl_unused ossl_inline void \
- ossl_sa_##type##_free_leaves(SPARSE_ARRAY_OF(type) * sa) \
- { \
- ossl_sa_free_leaves((OPENSSL_SA *)sa); \
- } \
- static ossl_unused ossl_inline size_t \
- ossl_sa_##type##_num(const SPARSE_ARRAY_OF(type) * sa) \
- { \
- return ossl_sa_num((OPENSSL_SA *)sa); \
- } \
- static ossl_unused void \
- ossl_sa_##type##_doall_thunk(ossl_uintmax_t idx, void *leaf, void *arg) \
- { \
- sa_##type##_leaffunc fn = *(sa_##type##_leaffunc *)arg; \
- (*fn)(idx, (type *)leaf); \
- } \
- static ossl_unused ossl_inline void \
- ossl_sa_##type##_doall(const SPARSE_ARRAY_OF(type) * sa, \
- void (*leaf)(ossl_uintmax_t, type *)) \
- { \
- ossl_sa_doall_arg((OPENSSL_SA *)sa, ossl_sa_##type##_doall_thunk, &leaf); \
- } \
- struct ossl_sa_##type##_doall_thunk { \
- sa_##type##_leaffunc_arg fn; \
- void *arg; \
- }; \
- static ossl_unused void \
- ossl_sa_##type##_doall_arg_thunk(ossl_uintmax_t idx, void *leaf, void *arg) \
- { \
- struct ossl_sa_##type##_doall_thunk *t = arg; \
- \
- (*t->fn)(idx, (type *)leaf, t->arg); \
- } \
- static ossl_unused ossl_inline void \
- ossl_sa_##type##_doall_arg(const SPARSE_ARRAY_OF(type) * sa, \
- void (*leaf)(ossl_uintmax_t, type *, void *), \
- void *arg) \
- { \
- struct ossl_sa_##type##_doall_thunk t; \
- \
- t.fn = leaf; \
- t.arg = arg; \
- ossl_sa_doall_arg((OPENSSL_SA *)sa, \
- ossl_sa_##type##_doall_arg_thunk, &t); \
- } \
- static ossl_unused ossl_inline ctype *ossl_sa_##type##_get(const SPARSE_ARRAY_OF(type) * sa, ossl_uintmax_t n) \
- { \
- return (type *)ossl_sa_get((OPENSSL_SA *)sa, n); \
- } \
- static ossl_unused ossl_inline int \
- ossl_sa_##type##_set(SPARSE_ARRAY_OF(type) * sa, \
- ossl_uintmax_t n, ctype *val) \
- { \
- return ossl_sa_set((OPENSSL_SA *)sa, n, (void *)val); \
- } \
+#define DEFINE_SPARSE_ARRAY_OF_INTERNAL(type, ctype) \
+ SPARSE_ARRAY_OF(type); \
+ typedef void (*sa_##type##_leaffunc)(ossl_uintmax_t idx, type *t); \
+ typedef void (*sa_##type##_leaffunc_arg)(ossl_uintmax_t idx, type *t, void *arg); \
+ static ossl_unused ossl_inline SPARSE_ARRAY_OF(type) *ossl_sa_##type##_new(void) \
+ { \
+ return (SPARSE_ARRAY_OF(type) *)ossl_sa_new(); \
+ } \
+ static ossl_unused ossl_inline void \
+ ossl_sa_##type##_free(SPARSE_ARRAY_OF(type) *sa) \
+ { \
+ ossl_sa_free((OPENSSL_SA *)sa); \
+ } \
+ static ossl_unused ossl_inline void \
+ ossl_sa_##type##_free_leaves(SPARSE_ARRAY_OF(type) *sa) \
+ { \
+ ossl_sa_free_leaves((OPENSSL_SA *)sa); \
+ } \
+ static ossl_unused ossl_inline size_t \
+ ossl_sa_##type##_num(const SPARSE_ARRAY_OF(type) *sa) \
+ { \
+ return ossl_sa_num((OPENSSL_SA *)sa); \
+ } \
+ static ossl_unused void \
+ ossl_sa_##type##_doall_thunk(ossl_uintmax_t idx, void *leaf, void *arg) \
+ { \
+ sa_##type##_leaffunc fn = *(sa_##type##_leaffunc *)arg; \
+ (*fn)(idx, (type *)leaf); \
+ } \
+ static ossl_unused ossl_inline void \
+ ossl_sa_##type##_doall(const SPARSE_ARRAY_OF(type) *sa, \
+ void (*leaf)(ossl_uintmax_t, type *)) \
+ { \
+ ossl_sa_doall_arg((OPENSSL_SA *)sa, ossl_sa_##type##_doall_thunk, &leaf); \
+ } \
+ struct ossl_sa_##type##_doall_thunk { \
+ sa_##type##_leaffunc_arg fn; \
+ void *arg; \
+ }; \
+ static ossl_unused void \
+ ossl_sa_##type##_doall_arg_thunk(ossl_uintmax_t idx, void *leaf, void *arg) \
+ { \
+ struct ossl_sa_##type##_doall_thunk *t = arg; \
+ \
+ (*t->fn)(idx, (type *)leaf, t->arg); \
+ } \
+ static ossl_unused ossl_inline void \
+ ossl_sa_##type##_doall_arg(const SPARSE_ARRAY_OF(type) *sa, \
+ void (*leaf)(ossl_uintmax_t, type *, void *), \
+ void *arg) \
+ { \
+ struct ossl_sa_##type##_doall_thunk t; \
+ \
+ t.fn = leaf; \
+ t.arg = arg; \
+ ossl_sa_doall_arg((OPENSSL_SA *)sa, \
+ ossl_sa_##type##_doall_arg_thunk, &t); \
+ } \
+ static ossl_unused ossl_inline ctype *ossl_sa_##type##_get(const SPARSE_ARRAY_OF(type) *sa, ossl_uintmax_t n) \
+ { \
+ return (type *)ossl_sa_get((OPENSSL_SA *)sa, n); \
+ } \
+ static ossl_unused ossl_inline int \
+ ossl_sa_##type##_set(SPARSE_ARRAY_OF(type) *sa, \
+ ossl_uintmax_t n, ctype *val) \
+ { \
+ return ossl_sa_set((OPENSSL_SA *)sa, n, (void *)val); \
+ } \
SPARSE_ARRAY_OF(type)
#define DEFINE_SPARSE_ARRAY_OF(type) \
diff --git a/include/internal/list.h b/include/internal/list.h
index 270e3f1dbb..82d851538a 100644
--- a/include/internal/list.h
+++ b/include/internal/list.h
@@ -25,28 +25,28 @@
(p) != NULL; \
(p) = ossl_list_##name##_next(p))
#define OSSL_LIST_FOREACH(p, name, l) \
- OSSL_LIST_FOREACH_FROM(p, name, ossl_list_##name##_head(l))
+ OSSL_LIST_FOREACH_FROM (p, name, ossl_list_##name##_head(l))
#define OSSL_LIST_FOREACH_REV_FROM(p, name, init) \
for ((p) = (init); \
(p) != NULL; \
(p) = ossl_list_##name##_prev(p))
#define OSSL_LIST_FOREACH_REV(p, name, l) \
- OSSL_LIST_FOREACH_FROM(p, name, ossl_list_##name##_tail(l))
+ OSSL_LIST_FOREACH_FROM (p, name, ossl_list_##name##_tail(l))
#define OSSL_LIST_FOREACH_DELSAFE_FROM(p, pn, name, init) \
for ((p) = (init); \
(p) != NULL && (((pn) = ossl_list_##name##_next(p)), 1); \
(p) = (pn))
#define OSSL_LIST_FOREACH_DELSAFE(p, pn, name, l) \
- OSSL_LIST_FOREACH_DELSAFE_FROM(p, pn, name, ossl_list_##name##_head(l))
+ OSSL_LIST_FOREACH_DELSAFE_FROM (p, pn, name, ossl_list_##name##_head(l))
#define OSSL_LIST_FOREACH_REV_DELSAFE_FROM(p, pn, name, init) \
for ((p) = (init); \
(p) != NULL && (((pn) = ossl_list_##name##_prev(p)), 1); \
(p) = (pn))
#define OSSL_LIST_FOREACH_REV_DELSAFE(p, pn, name, l) \
- OSSL_LIST_FOREACH_REV_DELSAFE_FROM(p, pn, name, ossl_list_##name##_tail(l))
+ OSSL_LIST_FOREACH_REV_DELSAFE_FROM (p, pn, name, ossl_list_##name##_tail(l))
/* Define a list structure */
#define OSSL_LIST(name) OSSL_LIST_##name
@@ -67,7 +67,7 @@
#define DEFINE_LIST_OF_IMPL(name, type) \
static ossl_unused ossl_inline void \
- ossl_list_##name##_init(OSSL_LIST(name) * list) \
+ ossl_list_##name##_init(OSSL_LIST(name) *list) \
{ \
memset(list, 0, sizeof(*list)); \
} \
@@ -78,24 +78,24 @@
sizeof(elem->ossl_list_##name)); \
} \
static ossl_unused ossl_inline int \
- ossl_list_##name##_is_empty(const OSSL_LIST(name) * list) \
+ ossl_list_##name##_is_empty(const OSSL_LIST(name) *list) \
{ \
return list->num_elems == 0; \
} \
static ossl_unused ossl_inline size_t \
- ossl_list_##name##_num(const OSSL_LIST(name) * list) \
+ ossl_list_##name##_num(const OSSL_LIST(name) *list) \
{ \
return list->num_elems; \
} \
static ossl_unused ossl_inline type * \
- ossl_list_##name##_head(const OSSL_LIST(name) * list) \
+ ossl_list_##name##_head(const OSSL_LIST(name) *list) \
{ \
assert(list->alpha == NULL \
|| list->alpha->ossl_list_##name.list == list); \
return list->alpha; \
} \
static ossl_unused ossl_inline type * \
- ossl_list_##name##_tail(const OSSL_LIST(name) * list) \
+ ossl_list_##name##_tail(const OSSL_LIST(name) *list) \
{ \
assert(list->omega == NULL \
|| list->omega->ossl_list_##name.list == list); \
@@ -120,7 +120,7 @@
return elem->ossl_list_##name.prev; \
} \
static ossl_unused ossl_inline void \
- ossl_list_##name##_remove(OSSL_LIST(name) * list, type * elem) \
+ ossl_list_##name##_remove(OSSL_LIST(name) *list, type *elem) \
{ \
assert(elem->ossl_list_##name.list == list); \
OSSL_LIST_DBG(elem->ossl_list_##name.list = NULL) \
@@ -137,7 +137,7 @@
sizeof(elem->ossl_list_##name)); \
} \
static ossl_unused ossl_inline void \
- ossl_list_##name##_insert_head(OSSL_LIST(name) * list, type * elem) \
+ ossl_list_##name##_insert_head(OSSL_LIST(name) *list, type *elem) \
{ \
assert(elem->ossl_list_##name.list == NULL); \
OSSL_LIST_DBG(elem->ossl_list_##name.list = list) \
@@ -151,7 +151,7 @@
list->num_elems++; \
} \
static ossl_unused ossl_inline void \
- ossl_list_##name##_insert_tail(OSSL_LIST(name) * list, type * elem) \
+ ossl_list_##name##_insert_tail(OSSL_LIST(name) *list, type *elem) \
{ \
assert(elem->ossl_list_##name.list == NULL); \
OSSL_LIST_DBG(elem->ossl_list_##name.list = list) \
@@ -165,8 +165,8 @@
list->num_elems++; \
} \
static ossl_unused ossl_inline void \
- ossl_list_##name##_insert_before(OSSL_LIST(name) * list, type * e, \
- type * elem) \
+ ossl_list_##name##_insert_before(OSSL_LIST(name) *list, type *e, \
+ type *elem) \
{ \
assert(elem->ossl_list_##name.list == NULL); \
OSSL_LIST_DBG(elem->ossl_list_##name.list = list) \
@@ -180,8 +180,8 @@
list->num_elems++; \
} \
static ossl_unused ossl_inline void \
- ossl_list_##name##_insert_after(OSSL_LIST(name) * list, type * e, \
- type * elem) \
+ ossl_list_##name##_insert_after(OSSL_LIST(name) *list, type *e, \
+ type *elem) \
{ \
assert(elem->ossl_list_##name.list == NULL); \
OSSL_LIST_DBG(elem->ossl_list_##name.list = list) \
@@ -195,7 +195,7 @@
list->num_elems++; \
} \
static ossl_unused ossl_inline void \
- ossl_list_##name##_join(OSSL_LIST(name) * lh, OSSL_LIST(name) * lt) \
+ ossl_list_##name##_join(OSSL_LIST(name) *lh, OSSL_LIST(name) *lt) \
{ \
OSSL_LIST_DBG(type * _p); /* local variable '_p' when debug */ \
if (lt == NULL || lh == NULL || lt->num_elems == 0 || lh == lt) \
diff --git a/include/internal/priority_queue.h b/include/internal/priority_queue.h
index fdda2b5a35..e702c573c3 100644
--- a/include/internal/priority_queue.h
+++ b/include/internal/priority_queue.h
@@ -16,56 +16,56 @@
#define PRIORITY_QUEUE_OF(type) OSSL_PRIORITY_QUEUE_##type
-#define DEFINE_PRIORITY_QUEUE_OF_INTERNAL(type, ctype) \
- typedef struct ossl_priority_queue_st_##type PRIORITY_QUEUE_OF(type); \
- static ossl_unused ossl_inline PRIORITY_QUEUE_OF(type) * ossl_pqueue_##type##_new(int (*compare)(const void *, const void *)) \
- { \
- return (PRIORITY_QUEUE_OF(type) *)ossl_pqueue_new( \
- compare); \
- } \
- static ossl_unused ossl_inline void \
- ossl_pqueue_##type##_free(PRIORITY_QUEUE_OF(type) * pq) \
- { \
- ossl_pqueue_free((OSSL_PQUEUE *)pq); \
- } \
- static ossl_unused ossl_inline void \
- ossl_pqueue_##type##_pop_free(PRIORITY_QUEUE_OF(type) * pq, \
- void (*freefunc)(void *)) \
- { \
- ossl_pqueue_pop_free((OSSL_PQUEUE *)pq, freefunc); \
- } \
- static ossl_unused ossl_inline int \
- ossl_pqueue_##type##_reserve(PRIORITY_QUEUE_OF(type) * pq, size_t n) \
- { \
- return ossl_pqueue_reserve((OSSL_PQUEUE *)pq, n); \
- } \
- static ossl_unused ossl_inline size_t \
- ossl_pqueue_##type##_num(const PRIORITY_QUEUE_OF(type) * pq) \
- { \
- return ossl_pqueue_num((OSSL_PQUEUE *)pq); \
- } \
- static ossl_unused ossl_inline int \
- ossl_pqueue_##type##_push(PRIORITY_QUEUE_OF(type) * pq, \
- ctype * data, size_t *elem) \
- { \
- return ossl_pqueue_push((OSSL_PQUEUE *)pq, (void *)data, elem); \
- } \
- static ossl_unused ossl_inline ctype * \
- ossl_pqueue_##type##_peek(const PRIORITY_QUEUE_OF(type) * pq) \
- { \
- return (type *)ossl_pqueue_peek((OSSL_PQUEUE *)pq); \
- } \
- static ossl_unused ossl_inline ctype * \
- ossl_pqueue_##type##_pop(PRIORITY_QUEUE_OF(type) * pq) \
- { \
- return (type *)ossl_pqueue_pop((OSSL_PQUEUE *)pq); \
- } \
- static ossl_unused ossl_inline ctype * \
- ossl_pqueue_##type##_remove(PRIORITY_QUEUE_OF(type) * pq, \
- size_t elem) \
- { \
- return (type *)ossl_pqueue_remove((OSSL_PQUEUE *)pq, elem); \
- } \
+#define DEFINE_PRIORITY_QUEUE_OF_INTERNAL(type, ctype) \
+ typedef struct ossl_priority_queue_st_##type PRIORITY_QUEUE_OF(type); \
+ static ossl_unused ossl_inline PRIORITY_QUEUE_OF(type) *ossl_pqueue_##type##_new(int (*compare)(const void *, const void *)) \
+ { \
+ return (PRIORITY_QUEUE_OF(type) *)ossl_pqueue_new( \
+ compare); \
+ } \
+ static ossl_unused ossl_inline void \
+ ossl_pqueue_##type##_free(PRIORITY_QUEUE_OF(type) *pq) \
+ { \
+ ossl_pqueue_free((OSSL_PQUEUE *)pq); \
+ } \
+ static ossl_unused ossl_inline void \
+ ossl_pqueue_##type##_pop_free(PRIORITY_QUEUE_OF(type) *pq, \
+ void (*freefunc)(void *)) \
+ { \
+ ossl_pqueue_pop_free((OSSL_PQUEUE *)pq, freefunc); \
+ } \
+ static ossl_unused ossl_inline int \
+ ossl_pqueue_##type##_reserve(PRIORITY_QUEUE_OF(type) *pq, size_t n) \
+ { \
+ return ossl_pqueue_reserve((OSSL_PQUEUE *)pq, n); \
+ } \
+ static ossl_unused ossl_inline size_t \
+ ossl_pqueue_##type##_num(const PRIORITY_QUEUE_OF(type) *pq) \
+ { \
+ return ossl_pqueue_num((OSSL_PQUEUE *)pq); \
+ } \
+ static ossl_unused ossl_inline int \
+ ossl_pqueue_##type##_push(PRIORITY_QUEUE_OF(type) *pq, \
+ ctype *data, size_t *elem) \
+ { \
+ return ossl_pqueue_push((OSSL_PQUEUE *)pq, (void *)data, elem); \
+ } \
+ static ossl_unused ossl_inline ctype * \
+ ossl_pqueue_##type##_peek(const PRIORITY_QUEUE_OF(type) *pq) \
+ { \
+ return (type *)ossl_pqueue_peek((OSSL_PQUEUE *)pq); \
+ } \
+ static ossl_unused ossl_inline ctype * \
+ ossl_pqueue_##type##_pop(PRIORITY_QUEUE_OF(type) *pq) \
+ { \
+ return (type *)ossl_pqueue_pop((OSSL_PQUEUE *)pq); \
+ } \
+ static ossl_unused ossl_inline ctype * \
+ ossl_pqueue_##type##_remove(PRIORITY_QUEUE_OF(type) *pq, \
+ size_t elem) \
+ { \
+ return (type *)ossl_pqueue_remove((OSSL_PQUEUE *)pq, elem); \
+ } \
struct ossl_priority_queue_st_##type
#define DEFINE_PRIORITY_QUEUE_OF(type) \
diff --git a/ssl/quic/quic_engine.c b/ssl/quic/quic_engine.c
index 370b9c3987..f6a9da8134 100644
--- a/ssl/quic/quic_engine.c
+++ b/ssl/quic/quic_engine.c
@@ -136,8 +136,8 @@ void ossl_quic_engine_update_poll_descriptors(QUIC_ENGINE *qeng, int force)
* the engine level in future when we can have multiple ports. This is not
* important currently as the port list has a single entry.
*/
- OSSL_LIST_FOREACH(port, port, &qeng->port_list)
- ossl_quic_port_update_poll_descriptors(port, force);
+ OSSL_LIST_FOREACH (port, port, &qeng->port_list)
+ ossl_quic_port_update_poll_descriptors(port, force);
}
/*
@@ -185,8 +185,7 @@ static void qeng_tick(QUIC_TICK_RESULT *res, void *arg, uint32_t flags)
return;
/* Iterate through all ports and service them. */
- OSSL_LIST_FOREACH(port, port, &qeng->port_list)
- {
+ OSSL_LIST_FOREACH (port, port, &qeng->port_list) {
QUIC_TICK_RESULT subr = { 0 };
ossl_quic_port_subtick(port, &subr, flags);
diff --git a/ssl/quic/quic_port.c b/ssl/quic/quic_port.c
index c8faaf8242..a0d9076470 100644
--- a/ssl/quic/quic_port.c
+++ b/ssl/quic/quic_port.c
@@ -477,8 +477,8 @@ int ossl_quic_port_set_net_wbio(QUIC_PORT *port, BIO *net_wbio)
if (!port_update_poll_desc(port, net_wbio, /*for_write=*/1))
return 0;
- OSSL_LIST_FOREACH(ch, ch, &port->channel_list)
- ossl_qtx_set_bio(ch->qtx, net_wbio);
+ OSSL_LIST_FOREACH (ch, ch, &port->channel_list)
+ ossl_qtx_set_bio(ch->qtx, net_wbio);
port->net_wbio = net_wbio;
port_update_addressing_mode(port);
@@ -821,8 +821,7 @@ void ossl_quic_port_subtick(QUIC_PORT *port, QUIC_TICK_RESULT *res,
port_rx_pre(port);
/* Iterate through all channels and service them. */
- OSSL_LIST_FOREACH(ch, ch, &port->channel_list)
- {
+ OSSL_LIST_FOREACH (ch, ch, &port->channel_list) {
QUIC_TICK_RESULT subr = { 0 };
ossl_quic_channel_subtick(ch, &subr, flags);
@@ -1921,9 +1920,9 @@ void ossl_quic_port_raise_net_error(QUIC_PORT *port,
if (triggering_ch != NULL)
ossl_quic_channel_raise_net_error(triggering_ch);
- OSSL_LIST_FOREACH(ch, ch, &port->channel_list)
- if (ch != triggering_ch)
- ossl_quic_channel_raise_net_error(ch);
+ OSSL_LIST_FOREACH (ch, ch, &port->channel_list)
+ if (ch != triggering_ch)
+ ossl_quic_channel_raise_net_error(ch);
}
void ossl_quic_port_restore_err_state(const QUIC_PORT *port)
diff --git a/ssl/quic/quic_rcidm.c b/ssl/quic/quic_rcidm.c
index f4488d52f9..d4ee12549c 100644
--- a/ssl/quic/quic_rcidm.c
+++ b/ssl/quic/quic_rcidm.c
@@ -191,7 +191,7 @@ struct quic_rcidm_st {
uint64_t retire_prior_to;
/* (SORT BY seq_num ASC) -> (RCID *) */
- PRIORITY_QUEUE_OF(RCID) * rcids;
+ PRIORITY_QUEUE_OF(RCID) *rcids;
/*
* Current RCID object we are using. This may differ from the first item in
@@ -314,8 +314,8 @@ void ossl_quic_rcidm_free(QUIC_RCIDM *rcidm)
while ((rcid = ossl_pqueue_RCID_pop(rcidm->rcids)) != NULL)
OPENSSL_free(rcid);
- OSSL_LIST_FOREACH_DELSAFE(rcid, rnext, retiring, &rcidm->retiring_list)
- OPENSSL_free(rcid);
+ OSSL_LIST_FOREACH_DELSAFE (rcid, rnext, retiring, &rcidm->retiring_list)
+ OPENSSL_free(rcid);
ossl_pqueue_RCID_free(rcidm->rcids);
OPENSSL_free(rcidm);
diff --git a/ssl/quic/quic_reactor_wait_ctx.c b/ssl/quic/quic_reactor_wait_ctx.c
index ae3b7cb3ef..b805d70cbf 100644
--- a/ssl/quic/quic_reactor_wait_ctx.c
+++ b/ssl/quic/quic_reactor_wait_ctx.c
@@ -45,9 +45,9 @@ int ossl_quic_reactor_wait_ctx_enter(QUIC_REACTOR_WAIT_CTX *ctx,
{
QUIC_REACTOR_WAIT_SLOT *slot;
- OSSL_LIST_FOREACH(slot, quic_reactor_wait_slot, &ctx->slots)
- if (slot->rtor == rtor)
- break;
+ OSSL_LIST_FOREACH (slot, quic_reactor_wait_slot, &ctx->slots)
+ if (slot->rtor == rtor)
+ break;
if (slot == NULL) {
if ((slot = OPENSSL_zalloc(sizeof(QUIC_REACTOR_WAIT_SLOT))) == NULL)
@@ -66,9 +66,9 @@ void ossl_quic_reactor_wait_ctx_leave(QUIC_REACTOR_WAIT_CTX *ctx,
{
QUIC_REACTOR_WAIT_SLOT *slot;
- OSSL_LIST_FOREACH(slot, quic_reactor_wait_slot, &ctx->slots)
- if (slot->rtor == rtor)
- break;
+ OSSL_LIST_FOREACH (slot, quic_reactor_wait_slot, &ctx->slots)
+ if (slot->rtor == rtor)
+ break;
assert(slot != NULL);
slot_deactivate(slot);
@@ -78,8 +78,7 @@ void ossl_quic_reactor_wait_ctx_cleanup(QUIC_REACTOR_WAIT_CTX *ctx)
{
QUIC_REACTOR_WAIT_SLOT *slot, *nslot;
- OSSL_LIST_FOREACH_DELSAFE(slot, nslot, quic_reactor_wait_slot, &ctx->slots)
- {
+ OSSL_LIST_FOREACH_DELSAFE (slot, nslot, quic_reactor_wait_slot, &ctx->slots) {
assert(slot->blocking_count == 0);
OPENSSL_free(slot);
}
diff --git a/test/quic_cc_test.c b/test/quic_cc_test.c
index 37c9f80a45..4082cac243 100644
--- a/test/quic_cc_test.c
+++ b/test/quic_cc_test.c
@@ -102,7 +102,7 @@ struct net_sim {
uint64_t latency; /* ms */
uint64_t spare_capacity;
- PRIORITY_QUEUE_OF(NET_PKT) * pkts;
+ PRIORITY_QUEUE_OF(NET_PKT) *pkts;
uint64_t total_acked, total_lost; /* bytes */
};
diff --git a/test/sparse_array_test.c b/test/sparse_array_test.c
index b41b50902c..4fe1fef7aa 100644
--- a/test/sparse_array_test.c
+++ b/test/sparse_array_test.c
@@ -36,7 +36,7 @@ static int test_sparse_array(void)
{ INT_MAX, "m" }, { 6666666, "d" }, { (ossl_uintmax_t)-1, "H" },
{ 99, "e" }
};
- SPARSE_ARRAY_OF(char) * sa;
+ SPARSE_ARRAY_OF(char) *sa;
size_t i, j;
int res = 0;
@@ -101,7 +101,7 @@ struct index_cases_st {
};
struct doall_st {
- SPARSE_ARRAY_OF(char) * sa;
+ SPARSE_ARRAY_OF(char) *sa;
size_t num_cases;
const struct index_cases_st *cases;
int res;