glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dyxlat: use xgrowarray

Browse Source 
* dyxlat.c (dyxlat_alloc): Use xgrowarray instead of xcalloc.
(dyxlat_add_pair): Use xgrowarray instead of xreallocarray.
This commit is contained in:
Дмитрий Левин 2017-12-14 00:05:04 +00:00
parent 3763830d0a
commit f236207f46
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dyxlat.c
View File

@ -44,8 +44,8 @@ dyxlat_alloc(const size_t nmemb)
struct dyxlat *const dyxlat = xmalloc(sizeof(*dyxlat));
dyxlat->used = 1;
dyxlat->allocated = nmemb ? nmemb : 16;
dyxlat->xlat = xcalloc(dyxlat->allocated, sizeof(struct xlat));
dyxlat->allocated = nmemb;
dyxlat->xlat = xgrowarray(NULL, &dyxlat->allocated, sizeof(struct xlat));
MARK_END(dyxlat->xlat[0]);
return dyxlat;
@ -90,11 +90,9 @@ dyxlat_add_pair(struct dyxlat *const dyxlat, const uint64_t val,
}
}
if (dyxlat->used >= dyxlat->allocated) {
dyxlat->allocated *= 2;
dyxlat->xlat = xreallocarray(dyxlat->xlat, dyxlat->allocated,
sizeof(struct xlat));
}
if (dyxlat->used >= dyxlat->allocated)
dyxlat->xlat = xgrowarray(dyxlat->xlat, &dyxlat->allocated,
sizeof(struct xlat));
dyxlat->xlat[dyxlat->used - 1].val = val;
dyxlat->xlat[dyxlat->used - 1].str = xstrndup(str, len);