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 /modutils | |
| 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 'modutils')
| -rw-r--r-- | modutils/insmod.c | 10 | ||||
| -rw-r--r-- | modutils/modprobe-small.c | 4 | ||||
| -rw-r--r-- | modutils/modprobe.c | 6 |
3 files changed, 9 insertions, 11 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c index d928be27d..df6bf10a0 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c | |||
| @@ -2201,7 +2201,7 @@ static struct obj_section *obj_create_alloced_section(struct obj_file *f, | |||
| 2201 | int newidx = f->header.e_shnum++; | 2201 | int newidx = f->header.e_shnum++; |
| 2202 | struct obj_section *sec; | 2202 | struct obj_section *sec; |
| 2203 | 2203 | ||
| 2204 | f->sections = xrealloc(f->sections, (newidx + 1) * sizeof(sec)); | 2204 | f->sections = xrealloc_vector(f->sections, 2, newidx); |
| 2205 | f->sections[newidx] = sec = arch_new_section(); | 2205 | f->sections[newidx] = sec = arch_new_section(); |
| 2206 | 2206 | ||
| 2207 | sec->header.sh_type = SHT_PROGBITS; | 2207 | sec->header.sh_type = SHT_PROGBITS; |
| @@ -2250,7 +2250,8 @@ static void *obj_extend_section(struct obj_section *sec, unsigned long more) | |||
| 2250 | { | 2250 | { |
| 2251 | unsigned long oldsize = sec->header.sh_size; | 2251 | unsigned long oldsize = sec->header.sh_size; |
| 2252 | if (more) { | 2252 | if (more) { |
| 2253 | sec->contents = xrealloc(sec->contents, sec->header.sh_size += more); | 2253 | sec->header.sh_size += more; |
| 2254 | sec->contents = xrealloc(sec->contents, sec->header.sh_size); | ||
| 2254 | } | 2255 | } |
| 2255 | return sec->contents + oldsize; | 2256 | return sec->contents + oldsize; |
| 2256 | } | 2257 | } |
| @@ -2736,7 +2737,8 @@ static void new_get_kernel_symbols(void) | |||
| 2736 | retry_kern_sym_load: | 2737 | retry_kern_sym_load: |
| 2737 | if (query_module(NULL, QM_SYMBOLS, syms, bufsize, &ret)) { | 2738 | if (query_module(NULL, QM_SYMBOLS, syms, bufsize, &ret)) { |
| 2738 | if (errno == ENOSPC && bufsize < ret) { | 2739 | if (errno == ENOSPC && bufsize < ret) { |
| 2739 | syms = xrealloc(syms, bufsize = ret); | 2740 | bufsize = ret; |
| 2741 | syms = xrealloc(syms, bufsize); | ||
| 2740 | goto retry_kern_sym_load; | 2742 | goto retry_kern_sym_load; |
| 2741 | } | 2743 | } |
| 2742 | bb_perror_msg_and_die("kernel: QM_SYMBOLS"); | 2744 | bb_perror_msg_and_die("kernel: QM_SYMBOLS"); |
| @@ -3080,7 +3082,7 @@ static void obj_allocate_commons(struct obj_file *f) | |||
| 3080 | if (i == f->header.e_shnum) { | 3082 | if (i == f->header.e_shnum) { |
| 3081 | struct obj_section *sec; | 3083 | struct obj_section *sec; |
| 3082 | 3084 | ||
| 3083 | f->sections = xrealloc(f->sections, (i + 1) * sizeof(sec)); | 3085 | f->sections = xrealloc(f->sections, 2, i); |
| 3084 | f->sections[i] = sec = arch_new_section(); | 3086 | f->sections[i] = sec = arch_new_section(); |
| 3085 | f->header.e_shnum = i + 1; | 3087 | f->header.e_shnum = i + 1; |
| 3086 | 3088 | ||
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c index e82ee4cef..4f073536a 100644 --- a/modutils/modprobe-small.c +++ b/modutils/modprobe-small.c | |||
| @@ -317,9 +317,7 @@ static FAST_FUNC int fileAction(const char *pathname, | |||
| 317 | } | 317 | } |
| 318 | 318 | ||
| 319 | cur = module_count++; | 319 | cur = module_count++; |
| 320 | if (!(cur & 0xfff)) { | 320 | modinfo = xrealloc_vector(modinfo, 12, cur); |
| 321 | modinfo = xrealloc(modinfo, sizeof(modinfo[0]) * (cur + 0x1001)); | ||
| 322 | } | ||
| 323 | modinfo[cur].pathname = xstrdup(pathname); | 321 | modinfo[cur].pathname = xstrdup(pathname); |
| 324 | modinfo[cur].desc = NULL; | 322 | modinfo[cur].desc = NULL; |
| 325 | modinfo[cur+1].pathname = NULL; | 323 | modinfo[cur+1].pathname = NULL; |
diff --git a/modutils/modprobe.c b/modutils/modprobe.c index 3ac5a81a5..1a4f5d4d4 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c | |||
| @@ -482,10 +482,8 @@ static struct dep_t *build_dep(void) | |||
| 482 | dep = xstrndup(deps, next - deps - ext + 1); | 482 | dep = xstrndup(deps, next - deps - ext + 1); |
| 483 | 483 | ||
| 484 | /* Add the new dependable module name */ | 484 | /* Add the new dependable module name */ |
| 485 | current->m_depcnt++; | 485 | current->m_deparr = xrealloc_vector(current->m_deparr, 2, current->m_depcnt); |
| 486 | current->m_deparr = xrealloc(current->m_deparr, | 486 | current->m_deparr[current->m_depcnt++] = dep; |
| 487 | sizeof(char *) * current->m_depcnt); | ||
| 488 | current->m_deparr[current->m_depcnt - 1] = dep; | ||
| 489 | 487 | ||
| 490 | p = next + 2; | 488 | p = next + 2; |
| 491 | } while (next < end); | 489 | } while (next < end); |