move more main systemd parts to core/

[elogind.git] / src / modules-load.c

diff --git a/src/modules-load.c b/src/modules-load.c
index 043e909d8096aacb6acda1fa73ce279ea836307e..0f2144c2ed84b853e6df14dfc037f3c74796afe2 100644 (file)
--- a/src/modules-load.c
+++ b/src/modules-load.c
@@ -6,16 +6,16 @@
   Copyright 2010 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
@@ -58,7 +58,8 @@ int main(int argc, char *argv[]) {
 
         umask(0022);
 
-        if (!(ctx = kmod_new(NULL, NULL))) {
+        ctx = kmod_new(NULL, NULL);
+        if (!ctx) {
                 log_error("Failed to allocate memory for kmod.");
                 goto finish;
         }
@@ -68,11 +69,13 @@ int main(int argc, char *argv[]) {
         kmod_set_log_fn(ctx, systemd_kmod_log, NULL);
 
         if (conf_files_list(&files, ".conf",
-                            "/run/modules-load.d",
                             "/etc/modules-load.d",
+                            "/run/modules-load.d",
                             "/usr/local/lib/modules-load.d",
                             "/usr/lib/modules-load.d",
+#ifdef HAVE_SPLIT_USR
                             "/lib/modules-load.d",
+#endif
                             NULL) < 0) {
                 log_error("Failed to enumerate modules-load.d files: %s", strerror(-r));
                 goto finish;
@@ -99,7 +102,7 @@ int main(int argc, char *argv[]) {
                         struct kmod_list *itr, *modlist = NULL;
                         int err;
 
-                        if (!(fgets(line, sizeof(line), f)))
+                        if (!fgets(line, sizeof(line), f))
                                 break;
 
                         l = strstrip(line);
@@ -114,7 +117,9 @@ int main(int argc, char *argv[]) {
                         }
 
                         kmod_list_foreach(itr, modlist) {
-                                struct kmod_module *mod = kmod_module_get_module(itr);
+                                struct kmod_module *mod;
+
+                                mod = kmod_module_get_module(itr);
                                 err = kmod_module_probe_insert_module(mod, probe_flags,
                                                                       NULL, NULL, NULL, NULL);