From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 24 Apr 2015 17:56:24 +0000 (+0200)
Subject: sysctl: minor simplifications
X-Git-Tag: v226.4~1^2~425
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=fbf626c7267dff7a824f2c7af389c94c2535b397;hp=0c1e4d7c72cf2752d54f22e980a854adff514325

sysctl: minor simplifications
---

diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c
index 650c9c98b..55f4e4860 100644
--- a/src/shared/sysctl-util.c
+++ b/src/shared/sysctl-util.c
@@ -58,31 +58,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);
 }