chiark / gitweb /
log.h: new log_oom() -> int -ENOMEM, use it
[elogind.git] / src / sysctl / sysctl.c
index 575095f8126a9bc283fad9bf529333d6840166e4..3bfc454c04330da01e7a3b57df7072e3a0705a7e 100644 (file)
@@ -31,6 +31,7 @@
 #include "strv.h"
 #include "util.h"
 #include "strv.h"
+#include "path-util.h"
 #include "conf-files.h"
 
 #define PROC_SYS_PREFIX "/proc/sys/"
@@ -44,10 +45,8 @@ static int apply_sysctl(const char *property, const char *value) {
         log_debug("Setting '%s' to '%s'", property, value);
 
         p = new(char, sizeof(PROC_SYS_PREFIX) + strlen(property));
-        if (!p) {
-                log_error("Out of memory");
-                return -ENOMEM;
-        }
+        if (!p)
+                return log_oom();
 
         n = stpcpy(p, PROC_SYS_PREFIX);
         strcpy(n, property);
@@ -190,10 +189,8 @@ static int parse_argv(int argc, char *argv[]) {
                                         *p = '/';
 
                         l = strv_append(arg_prefixes, optarg);
-                        if (!l) {
-                                log_error("Out of memory");
-                                return -ENOMEM;
-                        }
+                        if (!l)
+                                return log_oom();
 
                         strv_free(arg_prefixes);
                         arg_prefixes = l;