From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 28 Jan 2013 00:44:52 +0000 (-0500)
Subject: Move generic specifier functions to shared
X-Git-Tag: v198~376
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=d848b9cbfa0ba72;hp=d9e5e694ea7841045975426163c96fc9f71e6f7d

Move generic specifier functions to shared

No functional change. This makes it possible to use them in install.c.
---

diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c
index a58c96c23..3aa735e5b 100644
--- a/src/core/unit-printf.c
+++ b/src/core/unit-printf.c
@@ -211,42 +211,6 @@ static char *specifier_user_shell(char specifier, void *data, void *userdata) {
         return strdup(shell);
 }
 
-static char *specifier_machine_id(char specifier, void *data, void *userdata) {
-        sd_id128_t id;
-        char *buf;
-        int r;
-
-        r = sd_id128_get_machine(&id);
-        if (r < 0)
-                return NULL;
-
-        buf = new(char, 33);
-        if (!buf)
-                return NULL;
-
-        return sd_id128_to_string(id, buf);
-}
-
-static char *specifier_boot_id(char specifier, void *data, void *userdata) {
-        sd_id128_t id;
-        char *buf;
-        int r;
-
-        r = sd_id128_get_boot(&id);
-        if (r < 0)
-                return NULL;
-
-        buf = new(char, 33);
-        if (!buf)
-                return NULL;
-
-        return sd_id128_to_string(id, buf);
-}
-
-static char *specifier_host_name(char specifier, void *data, void *userdata) {
-        return gethostname_malloc();
-}
-
 char *unit_name_printf(Unit *u, const char* format) {
 
         /*
diff --git a/src/shared/specifier.c b/src/shared/specifier.c
index 599027cd4..7577c9105 100644
--- a/src/shared/specifier.c
+++ b/src/shared/specifier.c
@@ -109,3 +109,39 @@ char *specifier_printf(const char *text, const Specifier table[], void *userdata
 char* specifier_string(char specifier, void *data, void *userdata) {
         return strdup(strempty(data));
 }
+
+char *specifier_machine_id(char specifier, void *data, void *userdata) {
+        sd_id128_t id;
+        char *buf;
+        int r;
+
+        r = sd_id128_get_machine(&id);
+        if (r < 0)
+                return NULL;
+
+        buf = new(char, 33);
+        if (!buf)
+                return NULL;
+
+        return sd_id128_to_string(id, buf);
+}
+
+char *specifier_boot_id(char specifier, void *data, void *userdata) {
+        sd_id128_t id;
+        char *buf;
+        int r;
+
+        r = sd_id128_get_boot(&id);
+        if (r < 0)
+                return NULL;
+
+        buf = new(char, 33);
+        if (!buf)
+                return NULL;
+
+        return sd_id128_to_string(id, buf);
+}
+
+char *specifier_host_name(char specifier, void *data, void *userdata) {
+        return gethostname_malloc();
+}
diff --git a/src/shared/specifier.h b/src/shared/specifier.h
index 25a27a423..0440dcac4 100644
--- a/src/shared/specifier.h
+++ b/src/shared/specifier.h
@@ -31,4 +31,8 @@ typedef struct Specifier {
 
 char *specifier_printf(const char *text, const Specifier table[], void *userdata);
 
-char* specifier_string(char specifier, void *data, void *userdata);
+char *specifier_string(char specifier, void *data, void *userdata);
+
+char *specifier_machine_id(char specifier, void *data, void *userdata);
+char *specifier_boot_id(char specifier, void *data, void *userdata);
+char *specifier_host_name(char specifier, void *data, void *userdata);