char **t, **k;
k = strv_split(p, ",");
- if (!k) {
- log_error("Out of memory");
- return -ENOMEM;
- }
+ if (!k)
+ return log_oom();
t = strv_merge(arg_proc_cmdline_modules, k);
strv_free(k);
- if (!t) {
- log_error("Out of memory");
- return -ENOMEM;
- }
+ if (!t)
+ return log_oom();
strv_free(arg_proc_cmdline_modules);
arg_proc_cmdline_modules = t;
}
static int parse_proc_cmdline(void) {
- char *line, *w, *state;
+ char _cleanup_free_ *line = NULL;
+ char *w, *state;
int r;
size_t l;
}
FOREACH_WORD_QUOTED(w, l, line, state) {
- char *word;
+ char _cleanup_free_ *word;
word = strndup(w, l);
- if (!word) {
- r = -ENOMEM;
- goto finish;
- }
+ if (!word)
+ return log_oom();
- if (startswith(word, "driver=")) {
+ if (startswith(word, "modules-load=")) {
- r = add_modules(word + 7);
+ r = add_modules(word + 13);
if (r < 0)
- goto finish;
+ return r;
- } else if (startswith(word, "rd.driver=")) {
+ } else if (startswith(word, "rd.modules-load=")) {
if (in_initrd()) {
- r = add_modules(word + 10);
+ r = add_modules(word + 16);
if (r < 0)
- goto finish;
+ return r;
}
}
-
- free(word);
}
- r = 0;
-
-finish:
- free(line);
- return r;
+ return 0;
}
static int load_module(struct kmod_ctx *ctx, const char *m) {
int main(int argc, char *argv[]) {
int r = EXIT_FAILURE, k;
- char **files, **fn, **i;
+ char **files = NULL, **fn, **i;
struct kmod_ctx *ctx;
if (argc > 1) {