From 228e93c5c58fc680873e6e0e3abb2d95bd333e00 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 30 Apr 2025 21:35:43 +0200
Subject: [PATCH] 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.
---
 src/shared/blkid-util.c | 32 ++++++++++++++++++++++++++++++++
 src/shared/blkid-util.h | 32 ++++++--------------------------
 src/shared/meson.build  |  1 +
 3 files changed, 39 insertions(+), 26 deletions(-)
 create mode 100644 src/shared/blkid-util.c

diff --git a/src/shared/blkid-util.c b/src/shared/blkid-util.c
new file mode 100644
index 00000000000..377a2778511
--- /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 abc4b6166d3..fab4ab29870 100644
--- 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 e206aba851a..5fc9cdc9a56 100644
--- 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',
-- 
2.47.3