repart: move NOP destructors into shared code

diff --git a/src/partition/repart.c b/src/partition/repart.c
index 46da0d04edc6587c78db910b09599b3921c1b1fd..0be7acf42e872a9b7ddb1f57d065819422f2ae5a 100644 (file)
--- 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 5ebb0ac576ad4ecfb5f86a2fa6804687d61e25e2..855997f3354c26383fad1b5801b1a813bd52b7ff 100644 (file)
--- 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