qi-hardware/eda-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/eda-tools.git synced 2024-09-29 01:00:44 +03:00
Code

b2/subex.c (compose): use stralloc_n instead of open-coding its functionality

Browse Source
This commit is contained in:
Werner Almesberger 2012-05-23 14:18:02 -03:00
parent 78bcb8d3de
commit db279b7920
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
b2/subex.c
View File

@ -92,7 +92,7 @@ static char *compose(const struct chunk *c,
const char *s, const regmatch_t *match, const char *units) const char *s, const regmatch_t *match, const char *units)
{ {
char *res = stralloc(""); char *res = stralloc("");
int res_len = 0, len; int res_len = 0;
const char *val; const char *val;
char *tmp, *tmp2; char *tmp, *tmp2;
int n; int n;
@ -118,10 +118,8 @@ static char *compose(const struct chunk *c,
} }
if (match[n].rm_so == -1) if (match[n].rm_so == -1)
break; break;
len = match[n].rm_eo-match[n].rm_so; tmp = stralloc_n(s+match[n].rm_so,
tmp = alloc_size(len); match[n].rm_eo-match[n].rm_so);
memcpy(tmp, s+match[n].rm_so, len);
tmp[len] = 0;
tmp2 = canonicalize(tmp, units ? units[n-1] : 0); tmp2 = canonicalize(tmp, units ? units[n-1] : 0);
append(&res, &res_len, tmp2); append(&res, &res_len, tmp2);
free(tmp); free(tmp);