summaryrefslogtreecommitdiff
path: root/src/sysctl
diff options
context:
space:
mode:
authorShawn Landden <shawnlandden@gmail.com>2012-07-25 14:55:59 -0700
committerKay Sievers <kay@vrfy.org>2012-07-26 11:48:26 +0200
commit0d0f0c50d3a1d90f03972a6abb82e6413daaa583 (patch)
tree74f41c8455dbd78599f49300315a2569a8989992 /src/sysctl
parente146e4516b9ea9907852e7ad609de39dca9e8769 (diff)
log.h: new log_oom() -> int -ENOMEM, use it
also a number of minor fixups and bug fixes: spelling, oom errors that didn't print errors, not properly forwarding error codes, few more consistency issues, et cetera
Diffstat (limited to 'src/sysctl')
-rw-r--r--src/sysctl/sysctl.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index b463c7fac7..3bfc454c04 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -45,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);
@@ -191,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;