From: Jim Meyering <jim@meyering.net>
Date: Sun, 4 Jan 2004 21:10:11 +0000 (+0000)
Subject: (n_tabs_allocated): New global.
X-Git-Tag: v5.1.1~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc52b7fc4351b041b8f7cd7a65a0ff6c603cfecb;p=thirdparty%2Fcoreutils.git

(n_tabs_allocated): New global.
(add_tabstop): Use x2nrealloc rather than xrealloc.
---

diff --git a/src/expand.c b/src/expand.c
index 8be52b5631..f92dca32a7 100644
--- a/src/expand.c
+++ b/src/expand.c
@@ -53,10 +53,6 @@
    allocated for the output line. */
 #define OUTPUT_BLOCK 256
 
-/* The number of bytes added at a time to the amount of memory
-   allocated for the list of tabstops. */
-#define TABLIST_BLOCK 256
-
 /* The name this program was run with. */
 char *program_name;
 
@@ -74,7 +70,8 @@ static int *tab_list;
 
 /* The index of the first invalid element of `tab_list',
    where the next element can be added. */
-static int first_free_tab;
+static size_t first_free_tab;
+static size_t n_tabs_allocated;
 
 /* Null-terminated array of input filenames. */
 static char **file_list;
@@ -142,9 +139,8 @@ add_tabstop (int tabval)
 {
   if (tabval == -1)
     return;
-  if (first_free_tab % TABLIST_BLOCK == 0)
-    tab_list = xrealloc (tab_list, (first_free_tab
-				    + TABLIST_BLOCK * sizeof (tab_list[0])));
+  if (first_free_tab == n_tabs_allocated)
+    tab_list = x2nrealloc (tab_list, &n_tabs_allocated, sizeof *tab_list);
   tab_list[first_free_tab++] = tabval;
 }