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
This commit is contained in:
parent
493829207c
commit
deeed59de0
29 changed files with 123 additions and 85 deletions
|
@ -2201,7 +2201,7 @@ static struct obj_section *obj_create_alloced_section(struct obj_file *f,
|
|||
int newidx = f->header.e_shnum++;
|
||||
struct obj_section *sec;
|
||||
|
||||
f->sections = xrealloc(f->sections, (newidx + 1) * sizeof(sec));
|
||||
f->sections = xrealloc_vector(f->sections, 2, newidx);
|
||||
f->sections[newidx] = sec = arch_new_section();
|
||||
|
||||
sec->header.sh_type = SHT_PROGBITS;
|
||||
|
@ -2250,7 +2250,8 @@ static void *obj_extend_section(struct obj_section *sec, unsigned long more)
|
|||
{
|
||||
unsigned long oldsize = sec->header.sh_size;
|
||||
if (more) {
|
||||
sec->contents = xrealloc(sec->contents, sec->header.sh_size += more);
|
||||
sec->header.sh_size += more;
|
||||
sec->contents = xrealloc(sec->contents, sec->header.sh_size);
|
||||
}
|
||||
return sec->contents + oldsize;
|
||||
}
|
||||
|
@ -2736,7 +2737,8 @@ static void new_get_kernel_symbols(void)
|
|||
retry_kern_sym_load:
|
||||
if (query_module(NULL, QM_SYMBOLS, syms, bufsize, &ret)) {
|
||||
if (errno == ENOSPC && bufsize < ret) {
|
||||
syms = xrealloc(syms, bufsize = ret);
|
||||
bufsize = ret;
|
||||
syms = xrealloc(syms, bufsize);
|
||||
goto retry_kern_sym_load;
|
||||
}
|
||||
bb_perror_msg_and_die("kernel: QM_SYMBOLS");
|
||||
|
@ -3080,7 +3082,7 @@ static void obj_allocate_commons(struct obj_file *f)
|
|||
if (i == f->header.e_shnum) {
|
||||
struct obj_section *sec;
|
||||
|
||||
f->sections = xrealloc(f->sections, (i + 1) * sizeof(sec));
|
||||
f->sections = xrealloc(f->sections, 2, i);
|
||||
f->sections[i] = sec = arch_new_section();
|
||||
f->header.e_shnum = i + 1;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue