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 /e2fsprogs/old_e2fsprogs/blkid | |
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 'e2fsprogs/old_e2fsprogs/blkid')
-rw-r--r-- | e2fsprogs/old_e2fsprogs/blkid/devname.c | 6 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/blkid/save.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/e2fsprogs/old_e2fsprogs/blkid/devname.c b/e2fsprogs/old_e2fsprogs/blkid/devname.c index 97d1c3548..5b9e48f13 100644 --- a/e2fsprogs/old_e2fsprogs/blkid/devname.c +++ b/e2fsprogs/old_e2fsprogs/blkid/devname.c | |||
@@ -152,7 +152,7 @@ static dev_t lvm_get_devno(const char *lvm_device) | |||
152 | dev_t ret = 0; | 152 | dev_t ret = 0; |
153 | 153 | ||
154 | DBG(DEBUG_DEVNAME, printf("opening %s\n", lvm_device)); | 154 | DBG(DEBUG_DEVNAME, printf("opening %s\n", lvm_device)); |
155 | if ((lvf = fopen(lvm_device, "r")) == NULL) { | 155 | if ((lvf = fopen_for_read(lvm_device)) == NULL) { |
156 | DBG(DEBUG_DEVNAME, printf("%s: (%d) %s\n", lvm_device, errno, | 156 | DBG(DEBUG_DEVNAME, printf("%s: (%d) %s\n", lvm_device, errno, |
157 | strerror(errno))); | 157 | strerror(errno))); |
158 | return 0; | 158 | return 0; |
@@ -233,7 +233,7 @@ evms_probe_all(blkid_cache cache) | |||
233 | FILE *procpt; | 233 | FILE *procpt; |
234 | char device[110]; | 234 | char device[110]; |
235 | 235 | ||
236 | procpt = fopen(PROC_EVMS_VOLUMES, "r"); | 236 | procpt = fopen_for_read(PROC_EVMS_VOLUMES); |
237 | if (!procpt) | 237 | if (!procpt) |
238 | return 0; | 238 | return 0; |
239 | while (fgets(line, sizeof(line), procpt)) { | 239 | while (fgets(line, sizeof(line), procpt)) { |
@@ -282,7 +282,7 @@ int blkid_probe_all(blkid_cache cache) | |||
282 | lvm_probe_all(cache); | 282 | lvm_probe_all(cache); |
283 | #endif | 283 | #endif |
284 | 284 | ||
285 | proc = fopen(PROC_PARTITIONS, "r"); | 285 | proc = fopen_for_read(PROC_PARTITIONS); |
286 | if (!proc) | 286 | if (!proc) |
287 | return -BLKID_ERR_PROC; | 287 | return -BLKID_ERR_PROC; |
288 | 288 | ||
diff --git a/e2fsprogs/old_e2fsprogs/blkid/save.c b/e2fsprogs/old_e2fsprogs/blkid/save.c index cdbaabcb1..3600260e2 100644 --- a/e2fsprogs/old_e2fsprogs/blkid/save.c +++ b/e2fsprogs/old_e2fsprogs/blkid/save.c | |||
@@ -102,7 +102,7 @@ int blkid_flush_cache(blkid_cache cache) | |||
102 | } | 102 | } |
103 | 103 | ||
104 | if (!file) { | 104 | if (!file) { |
105 | file = fopen(filename, "w"); | 105 | file = fopen_for_write(filename); |
106 | opened = filename; | 106 | opened = filename; |
107 | } | 107 | } |
108 | 108 | ||