chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update TODO
[elogind.git]
/
src
/
sysctl
/
sysctl.c
diff --git
a/src/sysctl/sysctl.c
b/src/sysctl/sysctl.c
index 57112a7ef9eaf23c33f402f20948cb897f54f15e..283eefe1a1d233e49786034668d64c80cbe507f6 100644
(file)
--- a/
src/sysctl/sysctl.c
+++ b/
src/sysctl/sysctl.c
@@
-65,7
+65,7
@@
static int apply_sysctl(const char *property, const char *value) {
log_debug("Setting '%s' to '%s'", property, value);
log_debug("Setting '%s' to '%s'", property, value);
- p = new(char, s
izeof("/proc/sys/") + strlen(property)
);
+ p = new(char, s
trlen("/proc/sys/") + strlen(property) + 1
);
if (!p)
return log_oom();
if (!p)
return log_oom();
@@
-123,7
+123,7
@@
static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
assert(path);
assert(path);
- r = search_and_fopen_nulstr(path, "re", conf_file_dirs, &f);
+ r = search_and_fopen_nulstr(path, "re",
NULL,
conf_file_dirs, &f);
if (r < 0) {
if (ignore_enoent && r == -ENOENT)
return 0;
if (r < 0) {
if (ignore_enoent && r == -ENOENT)
return 0;
@@
-245,7
+245,6
@@
static int parse_argv(int argc, char *argv[]) {
case ARG_PREFIX: {
char *p;
case ARG_PREFIX: {
char *p;
- char **l;
for (p = optarg; *p; p++)
if (*p == '.')
for (p = optarg; *p; p++)
if (*p == '.')