From ac010944301152587b7beeb1027e949ddb1d7391 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Sat, 17 Feb 2018 17:06:56 +0100 Subject: [PATCH] cgfsng: move cg_legacy_must_prefix_named() Signed-off-by: Christian Brauner --- src/lxc/cgroups/cgfsng.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c index 62acbeca6..cf3484cda 100644 --- a/src/lxc/cgroups/cgfsng.c +++ b/src/lxc/cgroups/cgfsng.c @@ -210,23 +210,6 @@ static void *must_alloc(size_t sz) return must_realloc(NULL, sz); } -/* Return a copy of @entry prepending "name=", i.e. turn "systemd" into - * "name=systemd". Do not fail. - */ -static char *cg_legacy_must_prefix_named(char *entry) -{ - size_t len; - char *prefixed; - - len = strlen(entry); - prefixed = must_alloc(len + 6); - - memcpy(prefixed, "name=", sizeof("name=")); - memcpy(prefixed + sizeof("name="), entry, len); - prefixed[len + 5] = '\0'; - return prefixed; -} - /* * Given a pointer to a null-terminated array of pointers, realloc to * add one entry, and point the new entry to NULL. Do not fail. Return @@ -263,6 +246,23 @@ static bool string_in_list(char **list, const char *entry) return false; } +/* Return a copy of @entry prepending "name=", i.e. turn "systemd" into + * "name=systemd". Do not fail. + */ +static char *cg_legacy_must_prefix_named(char *entry) +{ + size_t len; + char *prefixed; + + len = strlen(entry); + prefixed = must_alloc(len + 6); + + memcpy(prefixed, "name=", sizeof("name=")); + memcpy(prefixed + sizeof("name="), entry, len); + prefixed[len + 5] = '\0'; + return prefixed; +} + /* * append an entry to the clist. Do not fail. * *clist must be NULL the first time we are called. -- 2.47.2