chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-rtnl: simplify sd_rtnl_message_addr_new()
[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 d37eec3f99feff993e05b84d42fb66099f44e6f3..3ac25fa98dbbfa6e13515b40eb8394d332705bcb 100644
(file)
--- a/
src/modules-load/modules-load.c
+++ b/
src/modules-load/modules-load.c
@@
-51,27
+51,21
@@
static const char conf_file_dirs[] =
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
static void systemd_kmod_log(void *data, int priority, const char *file, int line,
#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)
-{
+ const char *fn, const char *format, va_list args) {
log_metav(priority, file, line, fn, format, args);
}
#pragma GCC diagnostic pop
static int add_modules(const char *p) {
log_metav(priority, file, line, fn, format, args);
}
#pragma GCC diagnostic pop
static int add_modules(const char *p) {
- char **t;
_cleanup_strv_free_ char **k = NULL;
k = strv_split(p, ",");
if (!k)
return log_oom();
_cleanup_strv_free_ char **k = NULL;
k = strv_split(p, ",");
if (!k)
return log_oom();
- t = strv_merge(arg_proc_cmdline_modules, k);
- if (!t)
+ if (strv_extend_strv(&arg_proc_cmdline_modules, k) < 0)
return log_oom();
return log_oom();
- strv_free(arg_proc_cmdline_modules);
- arg_proc_cmdline_modules = t;
-
return 0;
}
return 0;
}
@@
-119,7
+113,7
@@
static int load_module(struct kmod_ctx *ctx, const char *m) {
struct kmod_list *itr, *modlist = NULL;
int r = 0;
struct kmod_list *itr, *modlist = NULL;
int r = 0;
- log_debug("load: %s
\n
", m);
+ log_debug("load: %s", m);
r = kmod_module_new_from_lookup(ctx, m, &modlist);
if (r < 0) {
r = kmod_module_new_from_lookup(ctx, m, &modlist);
if (r < 0) {
@@
-187,7
+181,7
@@
static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent
return r;
}
return r;
}
- log_debug("apply: %s
\n
", path);
+ log_debug("apply: %s", path);
for (;;) {
char line[LINE_MAX], *l;
int k;
for (;;) {
char line[LINE_MAX], *l;
int k;