From 703b8d1aad4cbad68010429cd3aec85ae7a61b2b Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 23 Nov 2017 14:42:41 +0100 Subject: [PATCH 1/1] Declare swag as const when possible. --- include/xbt/swag.h | 5 +++-- src/xbt/swag.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/xbt/swag.h b/include/xbt/swag.h index 0f25e2b29b..f56e8f64e3 100644 --- a/include/xbt/swag.h +++ b/include/xbt/swag.h @@ -74,6 +74,7 @@ struct xbt_swag { }; typedef struct xbt_swag s_xbt_swag_t; typedef struct xbt_swag* xbt_swag_t; +typedef const struct xbt_swag* const_xbt_swag_t; /**< A typical swag */ /* @} */ @@ -108,13 +109,13 @@ XBT_PUBLIC(void) xbt_swag_insert_at_head(void *obj, xbt_swag_t swag); XBT_PUBLIC(void) xbt_swag_insert_at_tail(void *obj, xbt_swag_t swag); XBT_PUBLIC(void *) xbt_swag_remove(void *obj, xbt_swag_t swag); XBT_PUBLIC(void *) xbt_swag_extract(xbt_swag_t swag); -XBT_PUBLIC(int) xbt_swag_size(xbt_swag_t swag); +XBT_PUBLIC(int) xbt_swag_size(const_xbt_swag_t swag); #define xbt_swag_getPrev(obj, offset) (((xbt_swag_hookup_t)(((char *) (obj)) + (offset)))->prev) #define xbt_swag_getNext(obj, offset) (((xbt_swag_hookup_t)(((char *) (obj)) + (offset)))->next) #define xbt_swag_belongs(obj, swag) (xbt_swag_getNext((obj), (swag)->offset) || (swag)->tail == (obj)) -static inline void *xbt_swag_getFirst(xbt_swag_t swag) +static inline void *xbt_swag_getFirst(const_xbt_swag_t swag) { return (swag->head); } diff --git a/src/xbt/swag.c b/src/xbt/swag.c index 9d3af40cc0..6bf90c0fab 100644 --- a/src/xbt/swag.c +++ b/src/xbt/swag.c @@ -172,7 +172,7 @@ void *xbt_swag_extract(xbt_swag_t swag) * \param swag a swag * \return the number of objects in \a swag */ -inline int xbt_swag_size(xbt_swag_t swag) +inline int xbt_swag_size(const_xbt_swag_t swag) { return (swag->count); } -- 2.20.1