circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 05:21:10 +00:00
Code Issues Projects Releases Wiki Activity

Add xreallocarray and remove nmemb argument from xrealloc.

Browse Source
This commit is contained in:
nicm
2014-10-08 17:35:58 +00:00
parent 77efcf8bdd
commit a27ba6e380
17 changed files with 65 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utf8.c
View File

@ -419,7 +419,7 @@ utf8_fromcstr(const char *src)
n = 0;
while (*src != '\0') {
dst = xrealloc(dst, n + 1, sizeof *dst);
dst = xreallocarray(dst, n + 1, sizeof *dst);
if (utf8_open(&dst[n], *src)) {
more = 1;
while (*++src != '\0' && more)
@ -436,7 +436,7 @@ utf8_fromcstr(const char *src)
n++;
}
dst = xrealloc(dst, n + 1, sizeof *dst);
dst = xreallocarray(dst, n + 1, sizeof *dst);
dst[n].size = 0;
return (dst);
}
@ -452,12 +452,12 @@ utf8_tocstr(struct utf8_data *src)
n = 0;
for(; src->size != 0; src++) {
dst = xrealloc(dst, n + src->size, 1);
dst = xreallocarray(dst, n + src->size, 1);
memcpy(dst + n, src->data, src->size);
n += src->size;
}
dst = xrealloc(dst, n + 1, 1);
dst = xreallocarray(dst, n + 1, 1);
dst[n] = '\0';
return (dst);
}