1
0
mirror of git://projects.qi-hardware.com/eda-tools.git synced 2025-04-21 12:27:27 +03:00

eeshow/misc/util.h (realloc_size, realloc_type_n): get rid of bare "realloc"

Finally ! Shoulds have done this a long time ago.
This commit is contained in:
Werner Almesberger
2016-08-22 21:00:10 -03:00
parent 1b250bd467
commit 465a36fde5
9 changed files with 25 additions and 29 deletions

View File

@@ -13,6 +13,7 @@
#include <stdlib.h>
#include <string.h>
#include "misc/util.h"
#include "misc/diag.h"
#include "kicad/ext.h"
@@ -68,10 +69,8 @@ void classify_files(struct file_names *fn, char *const *args,
break;
case ext_lib:
fn->n_libs++;
fn->libs = realloc(fn->libs,
fn->n_libs * sizeof(const char *));
if (!fn->libs)
diag_pfatal("realloc");
fn->libs = realloc_type_n(fn->libs, const char *,
fn->n_libs);
fn->libs[fn->n_libs - 1] = args[i];
break;
case ext_pl:

View File

@@ -109,9 +109,7 @@ static char *expand(const struct pl_ctx *pl, const char *s,
break;
}
len = strlen(x);
res = realloc(res, size + p - s + len);
if (!res)
diag_pfatal("realloc");
res = realloc_size(res, size + p - s + len);
memcpy(res + size, s, p - s);
size += p - s;
s = p + 2;
@@ -120,9 +118,7 @@ static char *expand(const struct pl_ctx *pl, const char *s,
}
len = strlen(s);
res = realloc(res, size + len + 1);
if (!res)
diag_pfatal("realloc");
res = realloc_size(res, size + len + 1);
memcpy(res + size, s, len + 1);
return res;
}
@@ -134,9 +130,7 @@ static char *increment(char *s, int inc, const char *range)
unsigned len = strlen(s);
int base, n;
t = realloc(s, len + 2);
if (!t)
diag_perror("realloc");
t = realloc_size(s, len + 2);
t[len + 1] = 0;
base = range[1] - range[0] + 1;

View File

@@ -149,9 +149,7 @@ static bool parse_field(struct sch_ctx *ctx, const char *line)
if (n == 0 && comp->comp && comp->comp->units > 1) {
len = strlen(txt->s);
s = realloc((void *) txt->s, len + 3);
if (!s)
diag_pfatal("realloc");
s = realloc_size((void *) txt->s, len + 3);
if (comp->unit <= 26)
sprintf(s + len, "%c", 'A' + comp->unit - 1);
else

View File

@@ -83,9 +83,7 @@ static void add_string(struct sexpr_ctx *ctx, const char *end)
if (!new)
return;
e->s = realloc(e->s, old + new + 1);
if (!e->s)
diag_pfatal("realloc");
e->s = realloc_size(e->s, old + new + 1);
memcpy(e->s + old, ctx->p, new);
e->s[old + new] = 0;
}