unit-name: rework unit_name_replace_instance function()

[elogind.git] / src / shared / unit-name.c

diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c
index 71937187922835fb3fcf3d6c3c8037356f0bfa9d..d6391228f2118686d4cae9cd79ca230a3d8ffc20 100644 (file)
--- a/src/shared/unit-name.c
+++ b/src/shared/unit-name.c
@@ -357,36 +357,29 @@ bool unit_name_is_instance(const char *n) {
 char *unit_name_replace_instance(const char *f, const char *i) {
         const char *p, *e;
         char *r, *k;
-        size_t a;
+        size_t a, b;
 
         assert(f);
 
         p = strchr(f, '@');
-        assert_se(e = strrchr(f, '.'));
-
-        a = p - f;
-
-        if (p) {
-                size_t b;
-
-                b = strlen(i);
-
-                r = new(char, a + 1 + b + strlen(e) + 1);
-                if (!r)
-                        return NULL;
+        if (!p)
+                return strdup(f);
 
-                k = mempcpy(r, f, a + 1);
-                k = mempcpy(k, i, b);
-        } else {
+        e = strrchr(f, '.');
+        if (!e)
+                assert_se(e = strchr(f, 0));
 
-                r = new(char, a + strlen(e) + 1);
-                if (!r)
-                        return NULL;
+        a = p - f;
+        b = strlen(i);
 
-                k = mempcpy(r, f, a);
-        }
+        r = new(char, a + 1 + b + strlen(e) + 1);
+        if (!r)
+                return NULL;
 
+        k = mempcpy(r, f, a + 1);
+        k = mempcpy(k, i, b);
         strcpy(k, e);
+
         return r;
 }