diff options
author | Nicolas Lécureuil <neoclust@mageia.org> | 2012-11-11 11:44:08 +0000 |
---|---|---|
committer | Nicolas Lécureuil <neoclust@mageia.org> | 2012-11-11 11:44:08 +0000 |
commit | 78f8c70e3799aad37359ca6b399195e95a94d07c (patch) | |
tree | 90022f297c6d47255b425c79fd323c156f4ebdb5 /mdk-stage1/probe-modules.c | |
parent | 820fd62a86a88b3c53d5ebe1939e4dc51cc8bcdc (diff) | |
download | drakx-backup-do-not-use-78f8c70e3799aad37359ca6b399195e95a94d07c.tar drakx-backup-do-not-use-78f8c70e3799aad37359ca6b399195e95a94d07c.tar.gz drakx-backup-do-not-use-78f8c70e3799aad37359ca6b399195e95a94d07c.tar.bz2 drakx-backup-do-not-use-78f8c70e3799aad37359ca6b399195e95a94d07c.tar.xz drakx-backup-do-not-use-78f8c70e3799aad37359ca6b399195e95a94d07c.zip |
Revert commit 6430
Diffstat (limited to 'mdk-stage1/probe-modules.c')
-rw-r--r-- | mdk-stage1/probe-modules.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/mdk-stage1/probe-modules.c b/mdk-stage1/probe-modules.c index c282a8d1c..ad4f9e4cd 100644 --- a/mdk-stage1/probe-modules.c +++ b/mdk-stage1/probe-modules.c @@ -25,46 +25,46 @@ void exit_bootsplash(void) {} void stg1_error_message(char *msg, ...) { - va_list args; - va_start(args, msg); - verror_message(msg, args); - va_end(args); + va_list args; + va_start(args, msg); + verror_message(msg, args); + va_end(args); } void fatal_error(char *msg) { - log_message("FATAL ERROR IN MODULES LOADER: %s\n\nI can't recover from this.\nYou may reboot your system.\n", msg); - exit(EXIT_FAILURE); + log_message("FATAL ERROR IN MODULES LOADER: %s\n\nI can't recover from this.\nYou may reboot your system.\n", msg); + exit(EXIT_FAILURE); } int main(int argc, char **argv, char **env) { - enum media_bus bus = BUS_ANY; - char *module = NULL; - char options[500] = ""; + enum media_bus bus = BUS_ANY; + char *module = NULL; + char options[500] = ""; - if (argc > 1) { - if (streq(argv[1], "--usb")) { - bus = BUS_USB; - } else if (!ptr_begins_static_str(argv[1], "--")) { - int i; - module = argv[1]; - for (i = 2; i < argc; i++) { - strcat(options, argv[i]); - strcat(options, " "); - } - } - } + if (argc > 1) { + if (streq(argv[1], "--usb")) { + bus = BUS_USB; + } else if (!ptr_begins_static_str(argv[1], "--")) { + int i; + module = argv[1]; + for (i = 2; i < argc; i++) { + strcat(options, argv[i]); + strcat(options, " "); + } + } + } - open_log(); - init_modules_insmoding(); + open_log(); + init_modules_insmoding(); - if (module) { - my_insmod(module, ANY_DRIVER_TYPE, options, 0); - } else { - find_media(bus); - } + if (module) { + my_insmod(module, ANY_DRIVER_TYPE, options, 0); + } else { + find_media(bus); + } - close_log(); + close_log(); - return 0; + return 0; } |