From e3e45d4f82daa5cd85ba40dde9127df900096c0c Mon Sep 17 00:00:00 2001 From: Simon Peeters Date: Sat, 4 Jan 2014 02:35:27 +0100 Subject: strv: multiple cleanups - turn strv_merge into strv_extend_strv. appending strv b to the end of strv a instead of creating a new strv - strv_append: remove in favor of strv_extend and strv_push. - strv_remove: write slightly more elegant - strv_remove_prefix: remove unused function - strv_overlap: use strv_contains - strv_printf: STRV_FOREACH handles NULL correctly --- src/modules-load/modules-load.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/modules-load') diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c index 5d141a8935..01987f2e3c 100644 --- a/src/modules-load/modules-load.c +++ b/src/modules-load/modules-load.c @@ -64,13 +64,9 @@ static int add_modules(const char *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(); - strv_free(arg_proc_cmdline_modules); - arg_proc_cmdline_modules = t; - return 0; } -- cgit v1.2.3-54-g00ecf