basic: Remove circular dep between alloc-util.h and memory-util.h

diff --git a/src/basic/alloc-util.c b/src/basic/alloc-util.c
index 96cf27dc37d2b5cac20a7e3b663a3d0d822f7c03..1a6b178eb7b7cf11209526ac558efab69462070b 100644 (file)
--- a/src/basic/alloc-util.c
+++ b/src/basic/alloc-util.c
@@ -6,7 +6,6 @@
 
 #include "alloc-util.h"
 #include "macro.h"
-#include "memory-util.h"
 
 void* memdup(const void *p, size_t l) {
         void *ret;

diff --git a/src/basic/alloc-util.h b/src/basic/alloc-util.h
index 8bb3c42113032fceca93b3eadd5b2102dc21ac4a..764a364a71bc5de3b0333aec5c710ef76d905db9 100644 (file)
--- a/src/basic/alloc-util.h
+++ b/src/basic/alloc-util.h
@@ -9,6 +9,7 @@
 
 #include "assert-util.h"
 #include "macro.h"
+#include "memory-util.h"
 
 #if HAS_FEATURE_MEMORY_SANITIZER
 #  include <sanitizer/msan_interface.h>
@@ -267,5 +268,3 @@ _alloc_(2) static inline void *realloc0(void *p, size_t new_size) {
 
         return q;
 }
-
-#include "memory-util.h"

diff --git a/src/basic/keyring-util.c b/src/basic/keyring-util.c
index 9f39161c1474abf5b234e8d37f53ea84f1ee4ba3..4d7431cdf239201743f4ab3dad38e769d2c45551 100644 (file)
--- a/src/basic/keyring-util.c
+++ b/src/basic/keyring-util.c
@@ -2,6 +2,7 @@
 
 #include "keyring-util.h"
 #include "log.h"
+#include "alloc-util.h"
 #include "memory-util.h"
 #include "missing_syscall.h"
 

diff --git a/src/basic/memory-util.c b/src/basic/memory-util.c
index 1596727e58f29c61d12b0834faf1a3aaa0f5feec..b39ec725a9967c654b291813d4f48f936f152783 100644 (file)
--- a/src/basic/memory-util.c
+++ b/src/basic/memory-util.c
@@ -3,6 +3,7 @@
 #include <threads.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "memory-util.h"
 
 size_t page_size(void) {
@@ -55,3 +56,14 @@ void* memdup_reverse(const void *mem, size_t size) {
 
         return p;
 }
+
+void* erase_and_free(void *p) {
+        size_t l;
+
+        if (!p)
+                return NULL;
+
+        l = MALLOC_SIZEOF_SAFE(p);
+        explicit_bzero_safe(p, l);
+        return mfree(p);
+}

diff --git a/src/basic/memory-util.h b/src/basic/memory-util.h
index 524e827a6c30f67d7b0debb406cd26e34d7beb89..443fc3a8ab5b65a0948a265d5057a71437121ac2 100644 (file)
--- a/src/basic/memory-util.h
+++ b/src/basic/memory-util.h
@@ -7,7 +7,6 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "alloc-util.h"
 #include "macro.h"
 #include "memory-util-fundamental.h"
 
@@ -98,16 +97,7 @@ static inline void* mempmem_safe(const void *haystack, size_t haystacklen, const
         return (uint8_t*) p + needlelen;
 }
 
-static inline void* erase_and_free(void *p) {
-        size_t l;
-
-        if (!p)
-                return NULL;
-
-        l = MALLOC_SIZEOF_SAFE(p);
-        explicit_bzero_safe(p, l);
-        return mfree(p);
-}
+void* erase_and_free(void *p);
 
 static inline void erase_and_freep(void *p) {
         erase_and_free(*(void**) p);

diff --git a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-pkcs11.c b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-pkcs11.c
index 07c95fece27c68ea475a44d21440a5bcaf398d6c..dc8f92f2e1fc9bfedc3f41b9ef9929b6a417b900 100644 (file)
--- a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-pkcs11.c
+++ b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-pkcs11.c
@@ -5,6 +5,7 @@
 
 #include "sd-json.h"
 
+#include "alloc-util.h"
 #include "cryptsetup-token.h"
 #include "cryptsetup-token-util.h"
 #include "hexdecoct.h"

diff --git a/src/shared/recovery-key.c b/src/shared/recovery-key.c
index 6a2f4d0f98b974af23238ce089155740741d9a86..3233f05dfc50490ca82d7d92ec82640137eb7c2e 100644 (file)
--- a/src/shared/recovery-key.c
+++ b/src/shared/recovery-key.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "memory-util.h"
 #include "random-util.h"
 #include "recovery-key.h"