cgfsng: cg_legacy_must_prefix_named()

s/must_prefix_named/cg_legacy_must_prefix_named/ Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 69273962
...@@ -199,25 +199,27 @@ static void free_string_list(char **clist) ...@@ -199,25 +199,27 @@ static void free_string_list(char **clist)
free(clist); free(clist);
} }
/* Allocate a pointer, do not fail */ /* Allocate a pointer, do not fail. */
static void *must_alloc(size_t sz) static void *must_alloc(size_t sz)
{ {
return must_realloc(NULL, sz); return must_realloc(NULL, sz);
} }
/* /* Return a copy of @entry prepending "name=", i.e. turn "systemd" into
* This is a special case - return a copy of @entry * "name=systemd". Do not fail.
* prepending 'name='. I.e. turn systemd into name=systemd.
* Do not fail.
*/ */
static char *must_prefix_named(char *entry) static char *cg_legacy_must_prefix_named(char *entry)
{ {
char *ret; size_t len;
size_t len = strlen(entry); char *prefixed;
ret = must_alloc(len + 6); len = strlen(entry);
snprintf(ret, len + 6, "name=%s", entry); prefixed = must_alloc(len + 6);
return ret;
memcpy(prefixed, "name=", sizeof("name="));
memcpy(prefixed + sizeof("name="), entry, len);
prefixed[len + 5] = '\0';
return prefixed;
} }
/* /*
...@@ -287,7 +289,7 @@ static void must_append_controller(char **klist, char **nlist, char ***clist, ch ...@@ -287,7 +289,7 @@ static void must_append_controller(char **klist, char **nlist, char ***clist, ch
else if (string_in_list(klist, entry)) else if (string_in_list(klist, entry))
copy = must_copy_string(entry); copy = must_copy_string(entry);
else else
copy = must_prefix_named(entry); copy = cg_legacy_must_prefix_named(entry);
(*clist)[newentry] = copy; (*clist)[newentry] = copy;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment