From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 12 Nov 2023 15:37:18 +0000 (+0900)
Subject: conf-parser: fix argument type of ConfigPerfItemLookup
X-Git-Tag: v255-rc2~40^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5996cc348ca532858daac669bf48992238102543;p=thirdparty%2Fsystemd.git

conf-parser: fix argument type of ConfigPerfItemLookup

Prompted by #29972.
---

diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h
index f1b03a8d152..a1768cd9198 100644
--- a/src/shared/conf-parser.h
+++ b/src/shared/conf-parser.h
@@ -62,7 +62,7 @@ typedef struct ConfigPerfItem {
 } ConfigPerfItem;
 
 /* Prototype for a low-level gperf lookup function */
-typedef const ConfigPerfItem* (*ConfigPerfItemLookup)(const char *section_and_lvalue, unsigned length);
+typedef const ConfigPerfItem* (*ConfigPerfItemLookup)(const char *section_and_lvalue, GPERF_LEN_TYPE length);
 
 /* Prototype for a generic high-level lookup function */
 typedef int (*ConfigItemLookup)(
diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c
index ac0ad80132d..8d2cec0c01b 100644
--- a/src/test/test-load-fragment.c
+++ b/src/test/test-load-fragment.c
@@ -39,6 +39,9 @@ static char *runtime_dir = NULL;
 
 STATIC_DESTRUCTOR_REGISTER(runtime_dir, rm_rf_physical_and_freep);
 
+/* For testing type compatibility. */
+_unused_ ConfigPerfItemLookup unused_lookup = load_fragment_gperf_lookup;
+
 TEST_RET(unit_file_get_set) {
         int r;
         _cleanup_hashmap_free_ Hashmap *h = NULL;