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

3 files changed, 7 insertions, 7 deletions

diff --git a/coreutils/cut.c b/coreutils/cut.c
index 179854988..3bac151b2 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -241,9 +241,10 @@ int cut_main(int argc UNUSED_PARAM, char **argv)
                         }
 
                         /* add the new list */
-                        cut_lists = xrealloc(cut_lists, sizeof(struct cut_list) * (++nlists));
-                        cut_lists[nlists-1].startpos = s;
-                        cut_lists[nlists-1].endpos = e;
+                        cut_lists = xrealloc_vector(cut_lists, 4, nlists);
+                        cut_lists[nlists].startpos = s;
+                        cut_lists[nlists].endpos = e;
+                        nlists++;
                 }
 
                 /* make sure we got some cut positions out of all that */
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index a2eaf11d9..eb4579857 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -735,9 +735,9 @@ decode_format_string(const char *s)
 
                 assert(s != next);
                 s = next;
+                spec = xrealloc_vector(spec, 4, n_specs);
+                memcpy(&spec[n_specs], &tspec, sizeof(spec[0]));
                 n_specs++;
-                spec = xrealloc(spec, n_specs * sizeof(*spec));
-                memcpy(&spec[n_specs-1], &tspec, sizeof *spec);
         }
 }
 
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 1fa552725..ac8fc9b2e 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -360,8 +360,7 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
                 for (;;) {
                         line = GET_LINE(fp);
                         if (!line) break;
-                        if (!(linecount & 63))
-                                lines = xrealloc(lines, sizeof(char *) * (linecount + 64));
+                        lines = xrealloc_vector(lines, 6, linecount);
                         lines[linecount++] = line;
                 }
                 fclose_if_not_stdin(fp);