chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log.h: new log_oom() -> int -ENOMEM, use it
[elogind.git]
/
src
/
sysctl
/
sysctl.c
diff --git
a/src/sysctl/sysctl.c
b/src/sysctl/sysctl.c
index b463c7fac741e5ba7f2f8628437e20e942590755..3bfc454c04330da01e7a3b57df7072e3a0705a7e 100644
(file)
--- 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));
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);
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);
*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;
strv_free(arg_prefixes);
arg_prefixes = l;