From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 6 Feb 2019 13:39:12 +0000 (+0100)
Subject: sd-id128: split the logic obtaining invocation ID from sd_id128_get_invocation()
X-Git-Tag: v242-rc1~125^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8efb042e0cf52ef386651606a2d3e187b69c840d;p=thirdparty%2Fsystemd.git

sd-id128: split the logic obtaining invocation ID from sd_id128_get_invocation()
---

diff --git a/src/libsystemd/sd-id128/sd-id128.c b/src/libsystemd/sd-id128/sd-id128.c
index e72af1593cd..6c7165eb939 100644
--- a/src/libsystemd/sd-id128/sd-id128.c
+++ b/src/libsystemd/sd-id128/sd-id128.c
@@ -215,6 +215,18 @@ static int get_invocation_from_keyring(sd_id128_t *ret) {
         return 1;
 }
 
+static int get_invocation_from_environment(sd_id128_t *ret) {
+        const char *e;
+
+        assert(ret);
+
+        e = secure_getenv("INVOCATION_ID");
+        if (!e)
+                return -ENXIO;
+
+        return sd_id128_from_string(e, ret);
+}
+
 _public_ int sd_id128_get_invocation(sd_id128_t *ret) {
         static thread_local sd_id128_t saved_invocation_id = {};
         int r;
@@ -237,13 +249,7 @@ _public_ int sd_id128_get_invocation(sd_id128_t *ret) {
                         return r;
 
                 if (r == 0) {
-                        const char *e;
-
-                        e = secure_getenv("INVOCATION_ID");
-                        if (!e)
-                                return -ENXIO;
-
-                        r = sd_id128_from_string(e, &saved_invocation_id);
+                        r = get_invocation_from_environment(&saved_invocation_id);
                         if (r < 0)
                                 return r;
                 }