From d5f1b1bbe0a881f66b6bb6951fa54e553002c24d Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 5 Jun 2009 12:06:05 +0200 Subject: *: add FAST_FUNC to function ptrs where it makes sense function old new delta evalcommand 1195 1209 +14 testcmd - 10 +10 printfcmd - 10 +10 echocmd - 10 +10 func_exec 270 276 +6 echo_dg 104 109 +5 store_nlmsg 85 89 +4 pseudo_exec_argv 195 198 +3 dotcmd 287 290 +3 machtime_stream 29 31 +2 discard_stream 24 26 +2 argstr 1299 1301 +2 killcmd 108 109 +1 evalfor 226 227 +1 daytime_stream 43 44 +1 run_list 2544 2543 -1 lookupvar 62 61 -1 ipaddr_modify 1310 1309 -1 ... parse_stream 2254 2245 -9 evalpipe 356 347 -9 collect_if 210 197 -13 read_opt 869 851 -18 handle_dollar 681 658 -23 print_addrinfo 1342 1303 -39 iterate_on_dir 156 59 -97 print_route 1709 1609 -100 ------------------------------------------------------------------------------ (add/remove: 3/0 grow/shrink: 12/130 up/down: 74/-767) Total: -693 bytes text data bss dec hex filename 841748 467 7872 850087 cf8a7 busybox_old 841061 467 7872 849400 cf5f8 busybox_unstripped Signed-off-by: Denys Vlasenko --- e2fsprogs/e2fs_lib.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'e2fsprogs/e2fs_lib.c') diff --git a/e2fsprogs/e2fs_lib.c b/e2fsprogs/e2fs_lib.c index 3e8d95687..70ae1f407 100644 --- a/e2fsprogs/e2fs_lib.c +++ b/e2fsprogs/e2fs_lib.c @@ -28,33 +28,20 @@ static void close_silently(int fd) /* Iterate a function on each entry of a directory */ int iterate_on_dir(const char *dir_name, - int (*func)(const char *, struct dirent *, void *), - void * private) + int FAST_FUNC (*func)(const char *, struct dirent *, void *), + void *private) { DIR *dir; - struct dirent *de, *dep; - int max_len, len; - - max_len = PATH_MAX + sizeof(struct dirent); - de = xmalloc(max_len+1); - memset(de, 0, max_len+1); + struct dirent *de; dir = opendir(dir_name); if (dir == NULL) { - free(de); return -1; } - while ((dep = readdir(dir))) { - len = sizeof(struct dirent); - if (len < dep->d_reclen) - len = dep->d_reclen; - if (len > max_len) - len = max_len; - memcpy(de, dep, len); + while ((de = readdir(dir)) != NULL) { func(dir_name, de, private); } closedir(dir); - free(de); return 0; } -- cgit v1.2.3