diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-21 23:05:26 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-21 23:05:26 +0000 |
commit | 5415c856eaccd1bc5d064022770a288f43b2e94f (patch) | |
tree | 5973db4e6f81b5e311e8944700ded5db1083d440 /modutils/modprobe-small.c | |
parent | b74a2dba571d1c5a6127c683fb50923336d9c59f (diff) | |
download | busybox-w32-5415c856eaccd1bc5d064022770a288f43b2e94f.tar.gz busybox-w32-5415c856eaccd1bc5d064022770a288f43b2e94f.tar.bz2 busybox-w32-5415c856eaccd1bc5d064022770a288f43b2e94f.zip |
libbb: [x]fopen_for_{read,write} introduced and used.
(by Valdimir)
function old new delta
config_open2 - 41 +41
config_read 507 542 +35
find_pair 169 187 +18
fopen_for_write - 14 +14
fopen_for_read - 14 +14
find_main 406 418 +12
xfopen_for_write - 10 +10
xfopen_for_read - 10 +10
popstring 134 140 +6
parse_inittab 396 401 +5
next_token 923 928 +5
pack_gzip 1659 1661 +2
bb__parsespent 117 119 +2
fallbackSort 1719 1717 -2
evalvar 1376 1374 -2
qrealloc 36 33 -3
...
...
...
...
singlemount 4579 4569 -10
process_stdin 443 433 -10
patch_main 1111 1101 -10
ifupdown_main 2175 2165 -10
file_action_grep 90 80 -10
uuidcache_init 649 637 -12
hush_main 797 785 -12
read_config 230 217 -13
dpkg_main 3835 3820 -15
read_line_input 3134 3110 -24
sysctl_main 232 203 -29
config_open 40 10 -30
WARN_BAD_LINE 44 - -44
login_main 1714 1575 -139
------------------------------------------------------------------------------
(add/remove: 5/1 grow/shrink: 8/74 up/down: 174/-737) Total: -563 bytes
Diffstat (limited to 'modutils/modprobe-small.c')
-rw-r--r-- | modutils/modprobe-small.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c index ae7c29cd1..f75dae8a3 100644 --- a/modutils/modprobe-small.c +++ b/modutils/modprobe-small.c | |||
@@ -299,7 +299,7 @@ static FAST_FUNC int fileAction(const char *pathname, | |||
299 | static int load_dep_bb(void) | 299 | static int load_dep_bb(void) |
300 | { | 300 | { |
301 | char *line; | 301 | char *line; |
302 | FILE *fp = fopen(DEPFILE_BB, "r"); | 302 | FILE *fp = fopen_for_read(DEPFILE_BB); |
303 | 303 | ||
304 | if (!fp) | 304 | if (!fp) |
305 | return 0; | 305 | return 0; |
@@ -492,7 +492,7 @@ static int already_loaded(const char *name) | |||
492 | char *line; | 492 | char *line; |
493 | FILE* modules; | 493 | FILE* modules; |
494 | 494 | ||
495 | modules = xfopen("/proc/modules", "r"); | 495 | modules = xfopen_for_read("/proc/modules"); |
496 | while ((line = xmalloc_fgets(modules)) != NULL) { | 496 | while ((line = xmalloc_fgets(modules)) != NULL) { |
497 | if (strncmp(line, name, len) == 0 && line[len] == ' ') { | 497 | if (strncmp(line, name, len) == 0 && line[len] == ' ') { |
498 | free(line); | 498 | free(line); |
@@ -688,7 +688,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv) | |||
688 | 688 | ||
689 | /* are we lsmod? -> just dump /proc/modules */ | 689 | /* are we lsmod? -> just dump /proc/modules */ |
690 | if ('l' == applet0) { | 690 | if ('l' == applet0) { |
691 | xprint_and_close_file(xfopen("/proc/modules", "r")); | 691 | xprint_and_close_file(xfopen_for_read("/proc/modules")); |
692 | return EXIT_SUCCESS; | 692 | return EXIT_SUCCESS; |
693 | } | 693 | } |
694 | 694 | ||