diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-02 12:51:26 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-02 12:51:26 +0000 |
commit | fb29038b59fa639b79de99c4edddfa6462918765 (patch) | |
tree | a527be76248ef6d10a5861a2e423d6f049b9d51a /editors/diff.c | |
parent | 509697f00df5286674fdbdf7b02a57fea83636d0 (diff) | |
download | busybox-w32-fb29038b59fa639b79de99c4edddfa6462918765.tar.gz busybox-w32-fb29038b59fa639b79de99c4edddfa6462918765.tar.bz2 busybox-w32-fb29038b59fa639b79de99c4edddfa6462918765.zip |
libbb: inntroduce and use bb_pstrcmp() and qsort_string_vector()
msh: glob0/glob1/glob2/glob3 are just a sorting routine! remove them.
bb_pstrcmp - 25 +25
qsort_string_vector - 24 +24
expand 2209 2227 +18
getopt32 1359 1370 +11
passwd_main 1072 1074 +2
handle_incoming_and_exit 2737 2735 -2
UNSPEC_print 66 64 -2
forkexec 1343 1339 -4
input_tab 3338 3330 -8
get_dir 185 177 -8
expmeta 481 473 -8
cmdputs 405 397 -8
xstrcmp 12 - -12
find_pair 187 167 -20
match_compare 25 - -25
dir_strcmp 25 - -25
glob2 27 - -27
glob3 34 - -34
glob1 256 - -256
------------------------------------------------------------------------------
(add/remove: 2/6 grow/shrink: 3/8 up/down: 80/-439) Total: -359 bytes
Diffstat (limited to 'editors/diff.c')
-rw-r--r-- | editors/diff.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/editors/diff.c b/editors/diff.c index 8844ec1c0..1359af838 100644 --- a/editors/diff.c +++ b/editors/diff.c | |||
@@ -1095,12 +1095,6 @@ static void do_diff(char *dir1, char *path1, char *dir2, char *path2) | |||
1095 | 1095 | ||
1096 | 1096 | ||
1097 | #if ENABLE_FEATURE_DIFF_DIR | 1097 | #if ENABLE_FEATURE_DIFF_DIR |
1098 | static int dir_strcmp(const void *p1, const void *p2) | ||
1099 | { | ||
1100 | return strcmp(*(char *const *) p1, *(char *const *) p2); | ||
1101 | } | ||
1102 | |||
1103 | |||
1104 | /* This function adds a filename to dl, the directory listing. */ | 1098 | /* This function adds a filename to dl, the directory listing. */ |
1105 | static int add_to_dirlist(const char *filename, | 1099 | static int add_to_dirlist(const char *filename, |
1106 | struct stat ATTRIBUTE_UNUSED * sb, void *userdata, | 1100 | struct stat ATTRIBUTE_UNUSED * sb, void *userdata, |
@@ -1144,7 +1138,7 @@ static char **get_dir(char *path) | |||
1144 | } | 1138 | } |
1145 | 1139 | ||
1146 | /* Sort dl alphabetically. */ | 1140 | /* Sort dl alphabetically. */ |
1147 | qsort(dl, dl_count, sizeof(char *), dir_strcmp); | 1141 | qsort_string_vector(dl, dl_count); |
1148 | 1142 | ||
1149 | dl[dl_count] = NULL; | 1143 | dl[dl_count] = NULL; |
1150 | return dl; | 1144 | return dl; |