chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: improve grammar and word formatting in numerous man pages
[elogind.git]
/
src
/
modules-load
/
modules-load.c
diff --git
a/src/modules-load/modules-load.c
b/src/modules-load/modules-load.c
index 88b1261494182e072b27b4bc5993aebc3591442b..7b19ee02efe43babce3fe9c0ead54d8d81ef07ee 100644
(file)
--- a/
src/modules-load/modules-load.c
+++ b/
src/modules-load/modules-load.c
@@
-34,6
+34,7
@@
#include "strv.h"
#include "conf-files.h"
#include "virt.h"
#include "strv.h"
#include "conf-files.h"
#include "virt.h"
+#include "fileio.h"
static char **arg_proc_cmdline_modules = NULL;
static char **arg_proc_cmdline_modules = NULL;
@@
-75,7
+76,7
@@
static int add_modules(const char *p) {
}
static int parse_proc_cmdline(void) {
}
static int parse_proc_cmdline(void) {
-
char _cleanup_free_
*line = NULL;
+
_cleanup_free_ char
*line = NULL;
char *w, *state;
int r;
size_t l;
char *w, *state;
int r;
size_t l;
@@
-90,7
+91,7
@@
static int parse_proc_cmdline(void) {
}
FOREACH_WORD_QUOTED(w, l, line, state) {
}
FOREACH_WORD_QUOTED(w, l, line, state) {
-
char _cleanup_free_
*word;
+
_cleanup_free_ char
*word;
word = strndup(w, l);
if (!word)
word = strndup(w, l);
if (!word)
@@
-147,7
+148,7
@@
static int load_module(struct kmod_ctx *ctx, const char *m) {
break;
case KMOD_MODULE_LIVE:
break;
case KMOD_MODULE_LIVE:
- log_
info
("Module '%s' is already loaded", kmod_module_get_name(mod));
+ log_
debug
("Module '%s' is already loaded", kmod_module_get_name(mod));
break;
default:
break;
default:
@@
-205,7
+206,7
@@
static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent
l = strstrip(line);
if (!*l)
continue;
l = strstrip(line);
if (!*l)
continue;
- if (strchr(COMMENTS, *l))
+ if (strchr(COMMENTS
"\n"
, *l))
continue;
k = load_module(ctx, l);
continue;
k = load_module(ctx, l);