summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-09-12 04:46:38 +0200
committerLennart Poettering <lennart@poettering.net>2012-09-12 04:46:38 +0200
commit8556879e0d14925ce897875c6c264368e2d048c2 (patch)
treece02f2378b2eafece807d1d2c53e98ee6b7fd256 /src/shared
parent49a32d43de3bd57bced22ed9a94342ea1efbb31c (diff)
unit-name: rework unit_name_replace_instance function()
https://bugzilla.redhat.com/show_bug.cgi?id=855863
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/unit-name.c35
1 files changed, 14 insertions, 21 deletions
diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c
index 7193718792..d6391228f2 100644
--- 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;
}