From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 18 Mar 2021 21:47:24 +0000 (+0100)
Subject: repart: move NOP destructors into shared code
X-Git-Tag: v249-rc1~388^2~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0efb3f83da1f2210b21aa26d3d2ecba3fca118ef;p=thirdparty%2Fsystemd.git

repart: move NOP destructors into shared code
---

diff --git a/src/partition/repart.c b/src/partition/repart.c
index 46da0d04edc..0be7acf42e8 100644
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -76,12 +76,6 @@
 /* LUKS2 takes off 16M of the partition size with its metadata by default */
 #define LUKS2_METADATA_SIZE (16*1024*1024)
 
-#if !HAVE_LIBCRYPTSETUP
-struct crypt_device;
-static inline void sym_crypt_free(struct crypt_device* cd) {}
-static inline void sym_crypt_freep(struct crypt_device** cd) {}
-#endif
-
 /* Note: When growing and placing new partitions we always align to 4K sector size. It's how newer hard disks
  * are designed, and if everything is aligned to that performance is best. And for older hard disks with 512B
  * sector size devices were generally assumed to have an even number of sectors, hence at the worst we'll
diff --git a/src/shared/cryptsetup-util.h b/src/shared/cryptsetup-util.h
index 5ebb0ac576a..855997f3354 100644
--- a/src/shared/cryptsetup-util.h
+++ b/src/shared/cryptsetup-util.h
@@ -61,4 +61,12 @@ int cryptsetup_get_token_as_json(struct crypt_device *cd, int idx, const char *v
 int cryptsetup_get_keyslot_from_token(JsonVariant *v);
 int cryptsetup_add_token_json(struct crypt_device *cd, JsonVariant *v);
 
+#else
+
+/* If libcryptsetup is not available, let's at least define the basic type and NOP destructors for it, to
+ * make a little bit less #ifdeferry necessary in main programs. */
+struct crypt_device;
+static inline void sym_crypt_free(struct crypt_device* cd) {}
+static inline void sym_crypt_freep(struct crypt_device** cd) {}
+
 #endif