shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 17:51:22 +03:00
Code

alloc-util: drop double eval from free_and_replace()

Browse Source 
Inspired by: 2744c7bb01
This commit is contained in:
Lennart Poettering 2021-07-29 21:05:38 +02:00
parent 7925d693a7
commit 7ecc424fbe
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/basic/alloc-util.h
View File

@ -51,9 +51,11 @@ static inline void *mfree(void *memory) {
#define free_and_replace(a, b) \ #define free_and_replace(a, b) \
({ \ ({ \
free(a); \ typeof(a)* _a = &(a); \
(a) = (b); \ typeof(b)* _b = &(b); \
(b) = NULL; \ free(*_a); \
(*_a) = (*_b); \
(*_b) = NULL; \
0; \ 0; \
}) })

8
src/basic/strv.h
View File

@ -233,9 +233,11 @@ int fputstrv(FILE *f, char * const *l, const char *separator, bool *space);
#define strv_free_and_replace(a, b) \ #define strv_free_and_replace(a, b) \
({ \ ({ \
strv_free(a); \ char ***_a = &(a); \
(a) = (b); \ char ***_b = &(b); \
(b) = NULL; \ strv_free(*_a); \
(*_a) = (*_b); \
(*_b) = NULL; \
0; \ 0; \
}) })