diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-08 05:14:36 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-08 05:14:36 +0000 |
| commit | deeed59de0a9bcc068ebd14d7496a6b26e45b890 (patch) | |
| tree | 7dafd469e9f6bca107adbf930fe77fff9958a0b6 /util-linux | |
| parent | 493829207c1c2a36d55aaa13abf806533d0cb87f (diff) | |
| download | busybox-w32-deeed59de0a9bcc068ebd14d7496a6b26e45b890.tar.gz busybox-w32-deeed59de0a9bcc068ebd14d7496a6b26e45b890.tar.bz2 busybox-w32-deeed59de0a9bcc068ebd14d7496a6b26e45b890.zip | |
libbb: introduce and use xrealloc_vector
function old new delta
xrealloc_vector_helper - 51 +51
create_list 84 99 +15
getopt_main 690 695 +5
passwd_main 1049 1053 +4
get_cached 85 89 +4
msh_main 1377 1380 +3
add_match 42 41 -1
read_lines 720 718 -2
grave 1068 1066 -2
fill_match_lines 143 141 -2
add_to_dirlist 67 65 -2
add_input_file 49 47 -2
act 252 250 -2
fsck_main 2252 2246 -6
man_main 765 757 -8
bb_internal_initgroups 228 220 -8
cut_main 1052 1041 -11
add_edge_to_node 55 43 -12
dpkg_main 3851 3835 -16
ifupdown_main 2202 2178 -24
sort_main 838 812 -26
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 5/15 up/down: 82/-124) Total: -42 bytes
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/getopt.c | 4 | ||||
| -rw-r--r-- | util-linux/mount.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/util-linux/getopt.c b/util-linux/getopt.c index bdf5f9716..25aa4069a 100644 --- a/util-linux/getopt.c +++ b/util-linux/getopt.c | |||
| @@ -238,8 +238,8 @@ static struct option *add_long_options(struct option *long_options, char *option | |||
| 238 | if (tlen == 0) | 238 | if (tlen == 0) |
| 239 | bb_error_msg_and_die("empty long option specified"); | 239 | bb_error_msg_and_die("empty long option specified"); |
| 240 | } | 240 | } |
| 241 | long_options = xrealloc(long_options, | 241 | //TODO: zeroing version of xrealloc_vector! |
| 242 | sizeof(long_options[0]) * (long_nr+2)); | 242 | long_options = xrealloc_vector(long_options, 4, long_nr); |
| 243 | long_options[long_nr].has_arg = arg_opt; | 243 | long_options[long_nr].has_arg = arg_opt; |
| 244 | long_options[long_nr].flag = NULL; | 244 | long_options[long_nr].flag = NULL; |
| 245 | long_options[long_nr].val = LONG_OPT; | 245 | long_options[long_nr].val = LONG_OPT; |
diff --git a/util-linux/mount.c b/util-linux/mount.c index 2ceabced6..9f9249f0a 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c | |||
| @@ -332,7 +332,7 @@ static long parse_mount_options(char *options, char **unrecognized) | |||
| 332 | if (unrecognized && i == ARRAY_SIZE(mount_options)) { | 332 | if (unrecognized && i == ARRAY_SIZE(mount_options)) { |
| 333 | // Add it to strflags, to pass on to kernel | 333 | // Add it to strflags, to pass on to kernel |
| 334 | i = *unrecognized ? strlen(*unrecognized) : 0; | 334 | i = *unrecognized ? strlen(*unrecognized) : 0; |
| 335 | *unrecognized = xrealloc(*unrecognized, i+strlen(options)+2); | 335 | *unrecognized = xrealloc(*unrecognized, i + strlen(options) + 2); |
| 336 | 336 | ||
| 337 | // Comma separated if it's not the first one | 337 | // Comma separated if it's not the first one |
| 338 | if (i) (*unrecognized)[i++] = ','; | 338 | if (i) (*unrecognized)[i++] = ','; |