summaryrefslogtreecommitdiff
path: root/modutils/insmod.c
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer2006-06-03 19:35:15 +0000
committerBernhard Reutner-Fischer2006-06-03 19:35:15 +0000
commitdeda6a5c0d00d02813cfda0d6262a24462909e9f (patch)
treecd2151ee74f7350abcbe692f8115e91547e08e15 /modutils/insmod.c
parent2c351a8f9875a4b597641bc4c0da76db485fe184 (diff)
downloadbusybox-deda6a5c0d00d02813cfda0d6262a24462909e9f.zip
busybox-deda6a5c0d00d02813cfda0d6262a24462909e9f.tar.gz
- 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.
Diffstat (limited to 'modutils/insmod.c')
-rw-r--r--modutils/insmod.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c
index f38daa2..f8464db 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -58,6 +58,7 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
+#include "busybox.h"
#include <stdlib.h>
#include <stdio.h>
#include <stddef.h>
@@ -70,7 +71,6 @@
#include <getopt.h>
#include <fcntl.h>
#include <sys/utsname.h>
-#include "busybox.h"
#if !defined(CONFIG_FEATURE_2_4_MODULES) && \
!defined(CONFIG_FEATURE_2_6_MODULES)
@@ -3313,7 +3313,7 @@ static struct obj_file *obj_load(FILE * fp, int loadprogbits)
}
if (f->header.e_ident[EI_CLASS] != ELFCLASSM
|| f->header.e_ident[EI_DATA] != (BB_BIG_ENDIAN
- ? ELFDATA2MSB : ELFDATA2LSB)
+ ? ELFDATA2MSB : ELFDATA2LSB)
|| f->header.e_ident[EI_VERSION] != EV_CURRENT
|| !MATCH_MACHINE(f->header.e_machine)) {
bb_error_msg("ELF file not for this architecture");