summaryrefslogtreecommitdiff
path: root/src/stdio
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2014-06-04 03:39:22 -0400
committerRich Felker <dalias@aerifal.cx>2014-06-04 03:39:22 -0400
commit6a25313c1122629b43b990ada70af1c209f03a54 (patch)
treef91e8a217f690c27cfa27e9914489081630f8237 /src/stdio
parentbdad2fefb206d9727d4a3254f7883b8455452d89 (diff)
downloadmusl-6a25313c1122629b43b990ada70af1c209f03a54.tar.gz
musl-6a25313c1122629b43b990ada70af1c209f03a54.tar.bz2
musl-6a25313c1122629b43b990ada70af1c209f03a54.tar.xz
musl-6a25313c1122629b43b990ada70af1c209f03a54.zip
simplify vasprintf implementation
the old implementation preallocated a buffer in order to try to avoid calling vsnprintf more than once. not only did this potentially lead to memory fragmentation from trimming with realloc; it also pulled in realloc/free, which otherwise might not be needed in a static linked program.
Diffstat (limited to 'src/stdio')
-rw-r--r--src/stdio/vasprintf.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/stdio/vasprintf.c b/src/stdio/vasprintf.c
index 68b7246b..08251bc2 100644
--- a/src/stdio/vasprintf.c
+++ b/src/stdio/vasprintf.c
@@ -3,26 +3,13 @@
#include <stdarg.h>
#include <stdlib.h>
-#define GUESS 240U
-
int vasprintf(char **s, const char *fmt, va_list ap)
{
va_list ap2;
- char *a;
- int l=GUESS;
-
- if (!(a=malloc(GUESS))) return -1;
-
va_copy(ap2, ap);
- l=vsnprintf(a, GUESS, fmt, ap2);
+ int l = vsnprintf(0, 0, fmt, ap2);
va_end(ap2);
- if (l<GUESS) {
- char *b = realloc(a, l+1U);
- *s = b ? b : a;
- return l;
- }
- free(a);
if (l<0 || !(*s=malloc(l+1U))) return -1;
return vsnprintf(*s, l+1U, fmt, ap);
}