diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-06-03 19:35:15 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-06-03 19:35:15 +0000 |
commit | deda6a5c0d00d02813cfda0d6262a24462909e9f (patch) | |
tree | cd2151ee74f7350abcbe692f8115e91547e08e15 /modutils/insmod.c | |
parent | 2c351a8f9875a4b597641bc4c0da76db485fe184 (diff) | |
download | busybox-w32-deda6a5c0d00d02813cfda0d6262a24462909e9f.tar.gz busybox-w32-deda6a5c0d00d02813cfda0d6262a24462909e9f.tar.bz2 busybox-w32-deda6a5c0d00d02813cfda0d6262a24462909e9f.zip |
- 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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c index f38daa257..f8464dbd1 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c | |||
@@ -58,6 +58,7 @@ | |||
58 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 58 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include "busybox.h" | ||
61 | #include <stdlib.h> | 62 | #include <stdlib.h> |
62 | #include <stdio.h> | 63 | #include <stdio.h> |
63 | #include <stddef.h> | 64 | #include <stddef.h> |
@@ -70,7 +71,6 @@ | |||
70 | #include <getopt.h> | 71 | #include <getopt.h> |
71 | #include <fcntl.h> | 72 | #include <fcntl.h> |
72 | #include <sys/utsname.h> | 73 | #include <sys/utsname.h> |
73 | #include "busybox.h" | ||
74 | 74 | ||
75 | #if !defined(CONFIG_FEATURE_2_4_MODULES) && \ | 75 | #if !defined(CONFIG_FEATURE_2_4_MODULES) && \ |
76 | !defined(CONFIG_FEATURE_2_6_MODULES) | 76 | !defined(CONFIG_FEATURE_2_6_MODULES) |
@@ -3313,7 +3313,7 @@ static struct obj_file *obj_load(FILE * fp, int loadprogbits) | |||
3313 | } | 3313 | } |
3314 | if (f->header.e_ident[EI_CLASS] != ELFCLASSM | 3314 | if (f->header.e_ident[EI_CLASS] != ELFCLASSM |
3315 | || f->header.e_ident[EI_DATA] != (BB_BIG_ENDIAN | 3315 | || f->header.e_ident[EI_DATA] != (BB_BIG_ENDIAN |
3316 | ? ELFDATA2MSB : ELFDATA2LSB) | 3316 | ? ELFDATA2MSB : ELFDATA2LSB) |
3317 | || f->header.e_ident[EI_VERSION] != EV_CURRENT | 3317 | || f->header.e_ident[EI_VERSION] != EV_CURRENT |
3318 | || !MATCH_MACHINE(f->header.e_machine)) { | 3318 | || !MATCH_MACHINE(f->header.e_machine)) { |
3319 | bb_error_msg("ELF file not for this architecture"); | 3319 | bb_error_msg("ELF file not for this architecture"); |