summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to 'editors')
-rw-r--r--editors/awk.c6
-rw-r--r--editors/diff.c4
-rw-r--r--editors/sed.c3
3 files changed, 7 insertions, 6 deletions
diff --git a/editors/awk.c b/editors/awk.c
index 2af3988..7af9e1e 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -1473,8 +1473,10 @@ static regex_t *as_regex(node *op, regex_t *preg)
/* gradually increasing buffer */
static void qrealloc(char **b, int n, int *size)
{
- if (!*b || n >= *size)
- *b = xrealloc(*b, *size = n + (n>>1) + 80);
+ if (!*b || n >= *size) {
+ *size = n + (n>>1) + 80;
+ *b = xrealloc(*b, *size);
+ }
}
/* resize field storage space */
diff --git a/editors/diff.c b/editors/diff.c
index 570c4c4..64ad651 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -1059,6 +1059,7 @@ static unsigned diffreg(char *file1, char *file2, int flags)
member = (int *) nfile[1];
equiv(sfile[0], slen[0], sfile[1], slen[1], member);
+//TODO: xrealloc_vector?
member = xrealloc(member, (slen[1] + 2) * sizeof(int));
class = (int *) nfile[0];
@@ -1168,8 +1169,7 @@ static int FAST_FUNC add_to_dirlist(const char *filename,
void *userdata,
int depth UNUSED_PARAM)
{
- /* +2: with space for eventual trailing NULL */
- dl = xrealloc(dl, (dl_count+2) * sizeof(dl[0]));
+ dl = xrealloc_vector(dl, 5, dl_count);
dl[dl_count] = xstrdup(filename + (int)(ptrdiff_t)userdata);
dl_count++;
return TRUE;
diff --git a/editors/sed.c b/editors/sed.c
index 88bae78..67e8841 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -732,8 +732,7 @@ static void flush_append(void)
static void add_input_file(FILE *file)
{
- G.input_file_list = xrealloc(G.input_file_list,
- (G.input_file_count + 1) * sizeof(FILE *));
+ G.input_file_list = xrealloc_vector(G.input_file_list, 2, G.input_file_count);
G.input_file_list[G.input_file_count++] = file;
}