cgroups: convert to strequal()

parent 8eaaad62
...@@ -135,7 +135,7 @@ static void must_append_controller(char **klist, char **nlist, char ***clist, ...@@ -135,7 +135,7 @@ static void must_append_controller(char **klist, char **nlist, char ***clist,
newentry = append_null_to_list((void ***)clist); newentry = append_null_to_list((void ***)clist);
if (strncmp(entry, "name=", 5) == 0) if (strnequal(entry, "name=", 5))
copy = must_copy_string(entry); copy = must_copy_string(entry);
else if (string_in_list(klist, entry)) else if (string_in_list(klist, entry))
copy = must_copy_string(entry); copy = must_copy_string(entry);
...@@ -630,7 +630,7 @@ static char **cg_hybrid_get_controllers(char **klist, char **nlist, char *line, ...@@ -630,7 +630,7 @@ static char **cg_hybrid_get_controllers(char **klist, char **nlist, char *line,
/* Note, if we change how mountinfo works, then our caller will need to /* Note, if we change how mountinfo works, then our caller will need to
* verify /sys/fs/cgroup/ in this field. * verify /sys/fs/cgroup/ in this field.
*/ */
if (strncmp(p, DEFAULT_CGROUP_MOUNTPOINT "/", 15) != 0) if (!strnequal(p, DEFAULT_CGROUP_MOUNTPOINT "/", 15))
return log_warn(NULL, "Found hierarchy not under " DEFAULT_CGROUP_MOUNTPOINT ": \"%s\"", p); return log_warn(NULL, "Found hierarchy not under " DEFAULT_CGROUP_MOUNTPOINT ": \"%s\"", p);
p += 15; p += 15;
...@@ -729,7 +729,7 @@ static char *cg_hybrid_get_mountpoint(char *line) ...@@ -729,7 +729,7 @@ static char *cg_hybrid_get_mountpoint(char *line)
p++; p++;
} }
if (strncmp(p, DEFAULT_CGROUP_MOUNTPOINT "/", 15) != 0) if (!strnequal(p, DEFAULT_CGROUP_MOUNTPOINT "/", 15))
return NULL; return NULL;
p2 = strchr(p + 15, ' '); p2 = strchr(p + 15, ' ');
...@@ -867,7 +867,7 @@ static int get_existing_subsystems(char ***klist, char ***nlist) ...@@ -867,7 +867,7 @@ static int get_existing_subsystems(char ***klist, char ***nlist)
} }
lxc_iterate_parts(tok, p, ",") { lxc_iterate_parts(tok, p, ",") {
if (strncmp(tok, "name=", 5) == 0) if (strnequal(tok, "name=", 5))
must_append_string(nlist, tok); must_append_string(nlist, tok);
else else
must_append_string(klist, tok); must_append_string(klist, tok);
...@@ -1806,7 +1806,7 @@ static int __cg_mount_direct(int type, struct hierarchy *h, ...@@ -1806,7 +1806,7 @@ static int __cg_mount_direct(int type, struct hierarchy *h,
if (!is_unified_hierarchy(h)) { if (!is_unified_hierarchy(h)) {
for (const char **it = (const char **)h->controllers; it && *it; it++) { for (const char **it = (const char **)h->controllers; it && *it; it++) {
if (strncmp(*it, "name=", STRLITERALLEN("name=")) == 0) if (strnequal(*it, "name=", STRLITERALLEN("name=")))
ret = fs_set_property(fd_fs, "name", *it + STRLITERALLEN("name=")); ret = fs_set_property(fd_fs, "name", *it + STRLITERALLEN("name="));
else else
ret = fs_set_property(fd_fs, *it, ""); ret = fs_set_property(fd_fs, *it, "");
...@@ -2131,7 +2131,7 @@ static int freezer_cgroup_events_cb(int fd, uint32_t events, void *cbdata, ...@@ -2131,7 +2131,7 @@ static int freezer_cgroup_events_cb(int fd, uint32_t events, void *cbdata,
state_string = "frozen 0"; state_string = "frozen 0";
while (getline(&line, &len, f) != -1) while (getline(&line, &len, f) != -1)
if (strncmp(line, state_string, STRLITERALLEN("frozen") + 2) == 0) if (strnequal(line, state_string, STRLITERALLEN("frozen") + 2))
return LXC_MAINLOOP_CLOSE; return LXC_MAINLOOP_CLOSE;
rewind(f); rewind(f);
...@@ -2916,8 +2916,8 @@ __cgfsng_ops static bool cgfsng_setup_limits_legacy(struct cgroup_ops *ops, ...@@ -2916,8 +2916,8 @@ __cgfsng_ops static bool cgfsng_setup_limits_legacy(struct cgroup_ops *ops,
lxc_list_for_each(iterator, sorted_cgroup_settings) { lxc_list_for_each(iterator, sorted_cgroup_settings) {
cg = iterator->elem; cg = iterator->elem;
if (do_devices == !strncmp("devices", cg->subsystem, 7)) { if (do_devices == strnequal("devices", cg->subsystem, 7)) {
if (cg_legacy_set_data(ops, cg->subsystem, cg->value, strncmp("cpuset", cg->subsystem, 6) == 0)) { if (cg_legacy_set_data(ops, cg->subsystem, cg->value, strnequal("cpuset", cg->subsystem, 6))) {
if (do_devices && (errno == EACCES || errno == EPERM)) { if (do_devices && (errno == EACCES || errno == EPERM)) {
SYSWARN("Failed to set \"%s\" to \"%s\"", cg->subsystem, cg->value); SYSWARN("Failed to set \"%s\" to \"%s\"", cg->subsystem, cg->value);
continue; continue;
...@@ -3001,7 +3001,7 @@ __cgfsng_ops static bool cgfsng_setup_limits(struct cgroup_ops *ops, ...@@ -3001,7 +3001,7 @@ __cgfsng_ops static bool cgfsng_setup_limits(struct cgroup_ops *ops,
struct lxc_cgroup *cg = iterator->elem; struct lxc_cgroup *cg = iterator->elem;
int ret; int ret;
if (strncmp("devices", cg->subsystem, 7) == 0) if (strnequal("devices", cg->subsystem, 7))
ret = bpf_device_cgroup_prepare(ops, conf, cg->subsystem, cg->value); ret = bpf_device_cgroup_prepare(ops, conf, cg->subsystem, cg->value);
else else
ret = lxc_write_openat(h->container_limit_path, cg->subsystem, cg->value, strlen(cg->value)); ret = lxc_write_openat(h->container_limit_path, cg->subsystem, cg->value, strlen(cg->value));
...@@ -3630,7 +3630,7 @@ int cgroup_set(const char *name, const char *lxcpath, ...@@ -3630,7 +3630,7 @@ int cgroup_set(const char *name, const char *lxcpath,
if (unified_fd < 0) if (unified_fd < 0)
return ret_errno(ENOCGROUP2); return ret_errno(ENOCGROUP2);
if (strncmp(filename, "devices.", STRLITERALLEN("devices.")) == 0) { if (strnequal(filename, "devices.", STRLITERALLEN("devices."))) {
struct device_item device = {}; struct device_item device = {};
ret = device_cgroup_rule_parse(&device, filename, value); ret = device_cgroup_rule_parse(&device, filename, value);
......
...@@ -33,7 +33,7 @@ bool is_cgroupfs_v1(char *line) ...@@ -33,7 +33,7 @@ bool is_cgroupfs_v1(char *line)
char *p = strstr(line, " - "); char *p = strstr(line, " - ");
if (!p) if (!p)
return false; return false;
return strncmp(p, " - cgroup ", 10) == 0; return strnequal(p, " - cgroup ", 10);
} }
bool is_cgroupfs_v2(char *line) bool is_cgroupfs_v2(char *line)
...@@ -42,7 +42,7 @@ bool is_cgroupfs_v2(char *line) ...@@ -42,7 +42,7 @@ bool is_cgroupfs_v2(char *line)
if (!p) if (!p)
return false; return false;
return strncmp(p, " - cgroup2 ", 11) == 0; return strnequal(p, " - cgroup2 ", 11);
} }
bool test_writeable_v1(char *mountpoint, char *path) bool test_writeable_v1(char *mountpoint, char *path)
......
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