projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix clock_nanosleep error case
[musl]
/
src
/
stdio
/
vasprintf.c
diff --git
a/src/stdio/vasprintf.c
b/src/stdio/vasprintf.c
index
68b7246
..
08251bc
100644
(file)
--- a/
src/stdio/vasprintf.c
+++ b/
src/stdio/vasprintf.c
@@
-3,26
+3,13
@@
#include <stdarg.h>
#include <stdlib.h>
#include <stdarg.h>
#include <stdlib.h>
-#define GUESS 240U
-
int vasprintf(char **s, const char *fmt, va_list ap)
{
va_list ap2;
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);
va_copy(ap2, ap);
-
l=vsnprintf(a, GUESS
, fmt, ap2);
+
int l = vsnprintf(0, 0
, fmt, ap2);
va_end(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);
}
if (l<0 || !(*s=malloc(l+1U))) return -1;
return vsnprintf(*s, l+1U, fmt, ap);
}