]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
cgfsng: cg_legacy_must_prefix_named()
authorChristian Brauner <christian.brauner@ubuntu.com>
Sat, 17 Feb 2018 16:03:38 +0000 (17:03 +0100)
committerChristian Brauner <christian.brauner@ubuntu.com>
Wed, 21 Feb 2018 14:48:06 +0000 (15:48 +0100)
s/must_prefix_named/cg_legacy_must_prefix_named/

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/cgroups/cgfsng.c

index af8e714dd6321f96f8184a65705d95f35b5e05aa..365ac3eee57c10415f7a16ac4d99e9d9fe25584b 100644 (file)
@@ -199,25 +199,27 @@ static void free_string_list(char **clist)
        free(clist);
 }
 
-/* Allocate a pointer, do not fail */
+/* Allocate a pointer, do not fail. */
 static void *must_alloc(size_t sz)
 {
        return must_realloc(NULL, sz);
 }
 
-/*
- * This is a special case - return a copy of @entry
- * prepending 'name='.  I.e. turn systemd into name=systemd.
- * Do not fail.
+/* Return a copy of @entry 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 = strlen(entry);
+       size_t len;
+       char *prefixed;
 
-       ret = must_alloc(len + 6);
-       snprintf(ret, len + 6, "name=%s", entry);
-       return ret;
+       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;
 }
 
 /*
@@ -287,7 +289,7 @@ static void must_append_controller(char **klist, char **nlist, char ***clist, ch
        else if (string_in_list(klist, entry))
                copy = must_copy_string(entry);
        else
-               copy = must_prefix_named(entry);
+               copy = cg_legacy_must_prefix_named(entry);
 
        (*clist)[newentry] = copy;
 }