#endif
;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
static void systemd_kmod_log(void *data, int priority, const char *file, int line,
const char *fn, const char *format, va_list args) {
+
+ DISABLE_WARNING_FORMAT_NONLITERAL;
log_metav(priority, file, line, fn, format, args);
+ REENABLE_WARNING;
}
-#pragma GCC diagnostic pop
static int add_modules(const char *p) {
- char **t;
_cleanup_strv_free_ char **k = NULL;
k = strv_split(p, ",");
return 0;
}
-static int parse_proc_cmdline(void) {
- _cleanup_free_ char *line = NULL;
- char *w, *state;
- size_t l;
+static int parse_proc_cmdline_word(const char *word) {
int r;
- r = proc_cmdline(&line);
- if (r < 0)
- log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
- if (r <= 0)
- return 0;
-
- FOREACH_WORD_QUOTED(w, l, line, state) {
- _cleanup_free_ char *word;
-
- word = strndup(w, l);
- if (!word)
- return log_oom();
-
- if (startswith(word, "modules-load=")) {
+ if (startswith(word, "modules-load=")) {
+ r = add_modules(word + 13);
+ if (r < 0)
+ return r;
- r = add_modules(word + 13);
+ } else if (startswith(word, "rd.modules-load=")) {
+ if (in_initrd()) {
+ r = add_modules(word + 16);
if (r < 0)
return r;
-
- } else if (startswith(word, "rd.modules-load=")) {
-
- if (in_initrd()) {
- r = add_modules(word + 16);
- if (r < 0)
- return r;
- }
-
}
}
umask(0022);
- if (parse_proc_cmdline() < 0)
+ if (parse_proc_cmdline(parse_proc_cmdline_word) < 0)
return EXIT_FAILURE;
ctx = kmod_new(NULL, NULL);
r = k;
}
- r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
- if (r < 0) {
- log_error("Failed to enumerate modules-load.d files: %s", strerror(-r));
+ k = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
+ if (k < 0) {
+ log_error("Failed to enumerate modules-load.d files: %s", strerror(-k));
+ if (r == 0)
+ r = k;
goto finish;
}