* src/conflicts.c (log_resolution): Fix indenting bugs I introduced.

Problem reported by Wojciech Polak.
* src/print-xml.c (xml_puts): Work even if LEVEL exceeds INT_MAX/2.
(xml_printf): Undo change I made on 21 September; that is,
indent 2 spaces, not 1.
This commit is contained in:
Paul Eggert
2007-09-24 06:34:44 +00:00
parent ad5feac4e2
commit a4f75309f2
3 changed files with 13 additions and 6 deletions

View File

@@ -494,9 +494,8 @@ void
xml_puts (FILE *out, int level, char const *s)
{
int i;
level *= 2;
for (i = 0; i < level; i++)
fputc (' ', out);
fputs (" ", out);
fputs (s, out);
fputc ('\n', out);
}
@@ -508,7 +507,7 @@ xml_printf (FILE *out, int level, char const *fmt, ...)
va_list arglist;
for (i = 0; i < level; i++)
fputc (' ', out);
fputs (" ", out);
va_start (arglist, fmt);
vfprintf (out, fmt, arglist);