From a7ccdeef396700d1ed78b9f97de0d10c706b169f Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 15 Nov 2009 23:28:11 +0100 Subject: libbb: added xfdopen_for_read/write function old new delta xfdopen_helper - 40 +40 logdir_open 1163 1184 +21 process_stdin 433 443 +10 xfdopen_for_write - 9 +9 doCommands 2465 2474 +9 patch_main 1214 1222 +8 bbunpack 457 465 +8 xfdopen_for_read - 7 +7 scan_tree 258 262 +4 xstrtoul_range_sfx 230 231 +1 sendmail_main 957 955 -2 passwd_main 1027 1023 -4 parse 969 964 -5 test_main 253 247 -6 sed_main 655 649 -6 dos2unix_main 437 429 -8 fbsplash_main 950 938 -12 handle_dir_common 371 354 -17 expand_vars_to_list 2197 2169 -28 update_passwd 1275 1246 -29 ------------------------------------------------------------------------------ (add/remove: 3/0 grow/shrink: 7/10 up/down: 117/-117) Total: 0 bytes Signed-off-by: Denys Vlasenko --- e2fsprogs/old_e2fsprogs/blkid/read.c | 4 +--- e2fsprogs/old_e2fsprogs/blkid/save.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'e2fsprogs/old_e2fsprogs/blkid') diff --git a/e2fsprogs/old_e2fsprogs/blkid/read.c b/e2fsprogs/old_e2fsprogs/blkid/read.c index 67bc8ee..f795a5d 100644 --- a/e2fsprogs/old_e2fsprogs/blkid/read.c +++ b/e2fsprogs/old_e2fsprogs/blkid/read.c @@ -374,9 +374,7 @@ void blkid_read_cache(blkid_cache cache) DBG(DEBUG_CACHE, printf("reading cache file %s\n", cache->bic_filename)); - file = fdopen(fd, "r"); - if (!file) - goto errout; + file = xfdopen_for_read(fd); while (fgets(buf, sizeof(buf), file)) { blkid_dev dev; diff --git a/e2fsprogs/old_e2fsprogs/blkid/save.c b/e2fsprogs/old_e2fsprogs/blkid/save.c index 3600260..e60cca4 100644 --- a/e2fsprogs/old_e2fsprogs/blkid/save.c +++ b/e2fsprogs/old_e2fsprogs/blkid/save.c @@ -95,7 +95,7 @@ int blkid_flush_cache(blkid_cache cache) sprintf(tmp, "%s-XXXXXX", filename); fd = mkstemp(tmp); if (fd >= 0) { - file = fdopen(fd, "w"); + file = xfdopen_for_write(fd); opened = tmp; } fchmod(fd, 0644); -- cgit v1.1