diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-05-07 18:34:35 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-05-09 17:53:42 +0900 |
| commit | 3facdc7da8ad424a38ce9c673fbb94a41e070a7d (patch) | |
| tree | e6fc2061f0b03dd01688e93b2814cc0e23281603 /src/basic | |
| parent | d94027ad16d6d8bae5ea91c014bfa56c131b7d9d (diff) | |
| download | systemd-3facdc7da8ad424a38ce9c673fbb94a41e070a7d.tar.gz | |
memory-util: make ArrayCleanup passed to array_cleanup() const
Should not change any behavior, preparation for later commits.
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/memory-util.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/basic/memory-util.h b/src/basic/memory-util.h index d03d52cd43..d26a0918e1 100644 --- a/src/basic/memory-util.h +++ b/src/basic/memory-util.h @@ -113,13 +113,13 @@ static inline void erase_char(char *p) { } /* An automatic _cleanup_-like logic for destroy arrays (i.e. pointers + size) when leaving scope */ -struct ArrayCleanup { +typedef struct ArrayCleanup { void **parray; size_t *pn; free_array_func_t pfunc; -}; +} ArrayCleanup; -static inline void array_cleanup(struct ArrayCleanup *c) { +static inline void array_cleanup(const ArrayCleanup *c) { assert(c); assert(!c->parray == !c->pn); @@ -137,7 +137,7 @@ static inline void array_cleanup(struct ArrayCleanup *c) { } #define CLEANUP_ARRAY(array, n, func) \ - _cleanup_(array_cleanup) _unused_ struct ArrayCleanup CONCATENATE(_cleanup_array_, UNIQ) = { \ + _cleanup_(array_cleanup) _unused_ const ArrayCleanup CONCATENATE(_cleanup_array_, UNIQ) = { \ .parray = (void**) &(array), \ .pn = &(n), \ .pfunc = (free_array_func_t) ({ \ |