From c0af9dee0d6dd790e749f9139d38730862288f8b Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 19 Jul 2023 06:58:19 +0900
Subject: [PATCH] udev: move declaration of ResolveNameTiming to udev-rules.c

It is only used by udevd and udevadm, not necessary in src/shared.

This also moves UDEV_NAME_SIZE and friends.
---
 src/shared/udev-util.c |  9 ---------
 src/shared/udev-util.h | 15 ---------------
 src/udev/udev-event.c  |  1 +
 src/udev/udev-rules.c  |  9 +++++++++
 src/udev/udev-rules.h  | 16 +++++++++++++++-
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
index e1f31e52acb..ca286ab24f5 100644
--- a/src/shared/udev-util.c
+++ b/src/shared/udev-util.c
@@ -18,19 +18,10 @@
 #include "path-util.h"
 #include "signal-util.h"
 #include "stat-util.h"
-#include "string-table.h"
 #include "string-util.h"
 #include "udev-util.h"
 #include "utf8.h"
 
-static const char* const resolve_name_timing_table[_RESOLVE_NAME_TIMING_MAX] = {
-        [RESOLVE_NAME_NEVER] = "never",
-        [RESOLVE_NAME_LATE]  = "late",
-        [RESOLVE_NAME_EARLY] = "early",
-};
-
-DEFINE_STRING_TABLE_LOOKUP(resolve_name_timing, ResolveNameTiming);
-
 int udev_set_max_log_level(char *str) {
         size_t n;
 
diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h
index 77e3ee95b0e..3f9d7740e92 100644
--- a/src/shared/udev-util.h
+++ b/src/shared/udev-util.h
@@ -5,21 +5,6 @@
 
 #include "time-util.h"
 
-#define UDEV_NAME_SIZE   512
-#define UDEV_PATH_SIZE  1024
-#define UDEV_LINE_SIZE 16384
-
-typedef enum ResolveNameTiming {
-        RESOLVE_NAME_NEVER,
-        RESOLVE_NAME_LATE,
-        RESOLVE_NAME_EARLY,
-        _RESOLVE_NAME_TIMING_MAX,
-        _RESOLVE_NAME_TIMING_INVALID = -EINVAL,
-} ResolveNameTiming;
-
-ResolveNameTiming resolve_name_timing_from_string(const char *s) _pure_;
-const char *resolve_name_timing_to_string(ResolveNameTiming i) _const_;
-
 int udev_set_max_log_level(char *str);
 int udev_parse_config(void);
 
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index 0876e478d81..d9a69301db9 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -13,6 +13,7 @@
 #include "udev-event.h"
 #include "udev-node.h"
 #include "udev-trace.h"
+#include "udev-util.h"
 #include "udev-watch.h"
 #include "user-util.h"
 
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 52d3f354fa9..abb44e99241 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -26,6 +26,7 @@
 #include "proc-cmdline.h"
 #include "socket-util.h"
 #include "stat-util.h"
+#include "string-table.h"
 #include "strv.h"
 #include "strxcpyx.h"
 #include "sysctl-util.h"
@@ -2955,3 +2956,11 @@ int udev_rules_apply_static_dev_perms(UdevRules *rules) {
 
         return 0;
 }
+
+static const char* const resolve_name_timing_table[_RESOLVE_NAME_TIMING_MAX] = {
+        [RESOLVE_NAME_NEVER] = "never",
+        [RESOLVE_NAME_LATE]  = "late",
+        [RESOLVE_NAME_EARLY] = "early",
+};
+
+DEFINE_STRING_TABLE_LOOKUP(resolve_name_timing, ResolveNameTiming);
diff --git a/src/udev/udev-rules.h b/src/udev/udev-rules.h
index 075f8b5ba06..4352312a9a5 100644
--- a/src/udev/udev-rules.h
+++ b/src/udev/udev-rules.h
@@ -4,7 +4,10 @@
 #include "alloc-util.h"
 #include "hashmap.h"
 #include "time-util.h"
-#include "udev-util.h"
+
+#define UDEV_NAME_SIZE   512
+#define UDEV_PATH_SIZE  1024
+#define UDEV_LINE_SIZE 16384
 
 typedef struct UdevRuleFile UdevRuleFile;
 typedef struct UdevRules UdevRules;
@@ -18,6 +21,14 @@ typedef enum {
         _ESCAPE_TYPE_INVALID = -EINVAL,
 } UdevRuleEscapeType;
 
+typedef enum ResolveNameTiming {
+        RESOLVE_NAME_NEVER,
+        RESOLVE_NAME_LATE,
+        RESOLVE_NAME_EARLY,
+        _RESOLVE_NAME_TIMING_MAX,
+        _RESOLVE_NAME_TIMING_INVALID = -EINVAL,
+} ResolveNameTiming;
+
 int udev_rule_parse_value(char *str, char **ret_value, char **ret_endpos);
 int udev_rules_parse_file(UdevRules *rules, const char *filename, bool extra_checks, UdevRuleFile **ret);
 unsigned udev_rule_file_get_issues(UdevRuleFile *rule_file);
@@ -33,3 +44,6 @@ int udev_rules_apply_to_event(UdevRules *rules, UdevEvent *event,
                               int timeout_signal,
                               Hashmap *properties_list);
 int udev_rules_apply_static_dev_perms(UdevRules *rules);
+
+ResolveNameTiming resolve_name_timing_from_string(const char *s) _pure_;
+const char *resolve_name_timing_to_string(ResolveNameTiming i) _const_;
-- 
2.47.3