X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=str.c;h=cca898d6aa0e4fdcf05eaea528b7d223ef054ccf;hp=557eaa38ca6352dab2c435ae619ef0fc60700047;hb=03918564cf43cfbd4f873f1b9c6ec3ccd15ede91;hpb=bc13db9debf825347d397c292e075cbe3f804ac0 diff --git a/str.c b/str.c index 557eaa3..cca898d 100644 --- a/str.c +++ b/str.c @@ -147,16 +147,12 @@ __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...) n = vsnprintf(msg, size, fmt, ap); va_end(ap); /* If that worked, return the string. */ - if (n > -1 && n < size) - break; + if (n < size) + return msg; /* Else try again with more space. */ - if (n > -1) /* glibc 2.1 */ - size = n + 1; /* precisely what is needed */ - else /* glibc 2.0 */ - size *= 2; /* twice the old size */ + size = n + 1; /* precisely what is needed */ msg = dss_realloc(msg, size); } - return msg; } /**