shared: Add blkid-util.c

IWYU analyzes source files and their corresponding header file so
let's add a source file blkid-util.c so blkid-util.h is analyzed as
well.

diff --git a/src/shared/blkid-util.c b/src/shared/blkid-util.c
new file mode 100644 (file)
index 0000000..377a277
--- /dev/null
+++ b/src/shared/blkid-util.c
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+
+#if HAVE_BLKID
+
+#include "blkid-util.h"
+#include "string-util.h"
+
+int blkid_partition_get_uuid_id128(blkid_partition p, sd_id128_t *ret) {
+        const char *s;
+
+        assert(p);
+
+        s = blkid_partition_get_uuid(p);
+        if (isempty(s))
+                return -ENXIO;
+
+        return sd_id128_from_string(s, ret);
+}
+
+int blkid_partition_get_type_id128(blkid_partition p, sd_id128_t *ret) {
+        const char *s;
+
+        assert(p);
+
+        s = blkid_partition_get_type_string(p);
+        if (isempty(s))
+                return -ENXIO;
+
+        return sd_id128_from_string(s, ret);
+}
+
+#endif

diff --git a/src/shared/blkid-util.h b/src/shared/blkid-util.h
index abc4b6166d3886080129a849fe0b58dced0f4844..fab4ab298708b769d7ddffcaaf88117f0783ff43 100644 (file)
--- a/src/shared/blkid-util.h
+++ b/src/shared/blkid-util.h
@@ -2,38 +2,18 @@
 #pragma once
 
 #if HAVE_BLKID
-#  include <blkid.h>
 
-#  include "sd-id128.h"
+#include <blkid.h>
 
-#  include "macro.h"
-#  include "string-util.h"
+#include "sd-id128.h"
 
-DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(blkid_probe, blkid_free_probe, NULL);
-
-static inline int blkid_partition_get_uuid_id128(blkid_partition p, sd_id128_t *ret) {
-        const char *s;
-
-        assert(p);
-
-        s = blkid_partition_get_uuid(p);
-        if (isempty(s))
-                return -ENXIO;
+#include "memory-util.h"
 
-        return sd_id128_from_string(s, ret);
-}
-
-static inline int blkid_partition_get_type_id128(blkid_partition p, sd_id128_t *ret) {
-        const char *s;
-
-        assert(p);
+DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(blkid_probe, blkid_free_probe, NULL);
 
-        s = blkid_partition_get_type_string(p);
-        if (isempty(s))
-                return -ENXIO;
+int blkid_partition_get_uuid_id128(blkid_partition p, sd_id128_t *ret);
 
-        return sd_id128_from_string(s, ret);
-}
+int blkid_partition_get_type_id128(blkid_partition p, sd_id128_t *ret);
 
 /* Define symbolic names for blkid_do_safeprobe() return values, since blkid only uses literal numbers. We
  * prefix these symbolic definitions with underscores, to not invade libblkid's namespace needlessly. */

diff --git a/src/shared/meson.build b/src/shared/meson.build
index e206aba851a42caed110c1844bc06955cbef2b28..5fc9cdc9a56ab7ab191551c3d877148288b90eeb 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -12,6 +12,7 @@ shared_sources = files(
         'battery-util.c',
         'binfmt-util.c',
         'bitmap.c',
+        'blkid-util.c',
         'blockdev-list.c',
         'blockdev-util.c',
         'bond-util.c',