From f23824164480857fd39581e80dc75a1f852e38a6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 24 Apr 2015 19:56:24 +0200 Subject: sysctl: minor simplifications Signed-off-by: Anthony G. Basile --- src/shared/sysctl-util.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c index 87c3389e2e..5512cc9da5 100644 --- a/src/shared/sysctl-util.c +++ b/src/shared/sysctl-util.c @@ -57,31 +57,23 @@ char *sysctl_normalize(char *s) { } int sysctl_write(const char *property, const char *value) { - _cleanup_free_ char *p = NULL; - char *n; - - log_debug("Setting '%s' to '%s'", property, value); + char *p; - p = new(char, strlen("/proc/sys/") + strlen(property) + 1); - if (!p) - return log_oom(); + assert(property); + assert(value); - n = stpcpy(p, "/proc/sys/"); - strcpy(n, property); + log_debug("Setting '%s' to '%s'", property, value); + p = strjoina("/proc/sys/", property); return write_string_file(p, value); } int sysctl_read(const char *property, char **content) { - _cleanup_free_ char *p = NULL; - char *n; - - p = new(char, strlen("/proc/sys/") + strlen(property) + 1); - if (!p) - return log_oom(); + char *p; - n = stpcpy(p, "/proc/sys/"); - strcpy(n, property); + assert(property); + assert(content); + p = strjoina("/proc/sys/", property); return read_full_file(p, content, NULL); } -- cgit v1.2.3-54-g00ecf