From deda6a5c0d00d02813cfda0d6262a24462909e9f Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Sat, 3 Jun 2006 19:35:15 +0000 Subject: - move #include busybox.h to the very top so we pull in the config and eventual platform specific includes in early. - remove two supposedly superfluous newlines from ...error_msg() in modprobe and use shorter boilerplate while at it. --- modutils/modprobe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modutils/modprobe.c') diff --git a/modutils/modprobe.c b/modutils/modprobe.c index 4446039..93e5102 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c @@ -11,6 +11,7 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ +#include "busybox.h" #include #include #include @@ -22,7 +23,6 @@ #include #include #include -#include "busybox.h" struct mod_opt_t { /* one-way list of options to pass to a module */ char * m_opt_val; @@ -880,7 +880,7 @@ int modprobe_main(int argc, char** argv) depend = build_dep ( ); if ( !depend ) - bb_error_msg_and_die ( "could not parse modules.dep\n" ); + bb_error_msg_and_die ( "could not parse modules.dep" ); if (remove_opt) { do { @@ -893,7 +893,7 @@ int modprobe_main(int argc, char** argv) } while ( ++optind < argc ); } else { if (optind >= argc) - bb_error_msg_and_die ( "No module or pattern provided\n" ); + bb_error_msg_and_die ( "No module or pattern provided" ); if ( mod_insert ( argv [optind], argc - optind - 1, argv + optind + 1 )) bb_error_msg_and_die ( "failed to load module %s", argv [optind] ); -- cgit v1.1