mirror of
https://github.com/freebsd/freebsd-src.git
synced 2026-10-28 11:25:21 +01:00
stdio: *memstream: slightly streamline growth function
Inverting the condition after realloc*() is a minor cleanup, but makes the success path a little cleaner to ease a future change. Reviewed by: des, jhb Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D57353
This commit is contained in:
1 parent
cecb0f45cb
commit
28327c58ee
2 files changed
+15
-18
No files matched your search
@@ -62,17 +62,16 @@ memstream_grow(struct memstream *ms, fpos_t newoff)
|
||||
newsize = newoff;
|
||||
if (newsize > ms->len) {
|
||||
buf = realloc(*ms->bufp, newsize + 1);
|
||||
if (buf != NULL) {
|
||||
if (buf == NULL)
|
||||
return (0);
|
||||
|
||||
#ifdef DEBUG
|
||||
fprintf(stderr, "MS: %p growing from %zd to %zd\n",
|
||||
ms, ms->len, newsize);
|
||||
fprintf(stderr, "MS: %p growing from %zd to %zd\n",
|
||||
ms, ms->len, newsize);
|
||||
#endif
|
||||
memset(buf + ms->len + 1, 0, newsize - ms->len);
|
||||
*ms->bufp = buf;
|
||||
ms->len = newsize;
|
||||
return (1);
|
||||
}
|
||||
return (0);
|
||||
memset(buf + ms->len + 1, 0, newsize - ms->len);
|
||||
*ms->bufp = buf;
|
||||
ms->len = newsize;
|
||||
}
|
||||
return (1);
|
||||
}
|
||||
|
||||
@@ -63,17 +63,15 @@ wmemstream_grow(struct wmemstream *ms, fpos_t newoff)
|
||||
newsize = newoff;
|
||||
if (newsize > ms->len) {
|
||||
buf = reallocarray(*ms->bufp, newsize + 1, sizeof(wchar_t));
|
||||
if (buf != NULL) {
|
||||
if (buf == NULL)
|
||||
return (0);
|
||||
#ifdef DEBUG
|
||||
fprintf(stderr, "WMS: %p growing from %zd to %zd\n",
|
||||
ms, ms->len, newsize);
|
||||
fprintf(stderr, "WMS: %p growing from %zd to %zd\n",
|
||||
ms, ms->len, newsize);
|
||||
#endif
|
||||
wmemset(buf + ms->len + 1, 0, newsize - ms->len);
|
||||
*ms->bufp = buf;
|
||||
ms->len = newsize;
|
||||
return (1);
|
||||
}
|
||||
return (0);
|
||||
wmemset(buf + ms->len + 1, 0, newsize - ms->len);
|
||||
*ms->bufp = buf;
|
||||
ms->len = newsize;
|
||||
}
|
||||
return (1);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user