From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 7 May 2023 09:34:35 +0000 (+0900)
Subject: memory-util: make ArrayCleanup passed to array_cleanup() const
X-Git-Tag: v254-rc1~501^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3facdc7da8ad424a38ce9c673fbb94a41e070a7d;p=thirdparty%2Fsystemd.git

memory-util: make ArrayCleanup passed to array_cleanup() const

Should not change any behavior, preparation for later commits.
---

diff --git a/src/basic/memory-util.h b/src/basic/memory-util.h
index d03d52cd438..d26a0918e1a 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) ({                         \