mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-26 09:50:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

gengtype.c (oprintf): Mostly revert changes from 2007-03-26...

Browse Source 
* gengtype.c (oprintf): Mostly revert changes from 2007-03-26;
	add comment explaining why vsnprintf cannot be used.

From-SVN: r123332
This commit is contained in:
Zack Weinberg 2007-03-29 14:59:52 +00:00 committed by Zack Weinberg
parent e89886a0ea
commit 311e3ff0b6
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2007-03-29 Zack Weinberg <zack@mrtock.ucsd.edu>
* gengtype.c (oprintf): Mostly revert changes from 2007-03-26;
add comment explaining why vsnprintf cannot be used.
2007-03-29 Douglas Gregor <doug.gregor@gmail.com>
PR tree-optimization/30666

39
gcc/gengtype.c
View File

@ -1475,24 +1475,26 @@ create_file (const char *name, const char *oname)
return f;
}
/* Print, like fprintf, to O. */
/* Print, like fprintf, to O.
N.B. You might think this could be implemented more efficiently
with vsnprintf(). Unfortunately, there are C libraries that
provide that function but without the C99 semantics for its return
value, making it impossible to know how much space is required. */
void
oprintf (outf_p o, const char *format, ...)
{
char *s;
size_t slength;
va_list ap;
/* Try first with the assumption that there is enough space. */
{
va_list ap;
va_start (ap, format);
slength = vsnprintf (o->buf + o->bufused, o->buflength - o->bufused,
format, ap);
va_end (ap);
}
va_start (ap, format);
slength = vasprintf (&s, format, ap);
if (s == NULL || (int)slength < 0)
fatal ("out of memory");
va_end (ap);
if (o->bufused + slength >= o->buflength)
if (o->bufused + slength > o->buflength)
{
/* There wasn't enough space. */
size_t new_len = o->buflength;
if (new_len == 0)
new_len = 1024;
@ -1501,21 +1503,10 @@ oprintf (outf_p o, const char *format, ...)
} while (o->bufused + slength >= new_len);
o->buf = XRESIZEVEC (char, o->buf, new_len);
o->buflength = new_len;
/* We now know that there is enough space. */
{
size_t slen2;
va_list ap;
va_start (ap, format);
slen2 = vsnprintf (o->buf + o->bufused, o->buflength - o->bufused,
format, ap);
va_end (ap);
gcc_assert (slen2 == slength);
gcc_assert (o->bufused + slen2 < o->buflength);
}
}
memcpy (o->buf + o->bufused, s, slength);
o->bufused += slength;
free (s);
}
/* Open the global header file and the language-specific header files. */