|
From: <sv...@va...> - 2009-08-15 23:05:51
|
Author: sewardj
Date: 2009-08-16 00:05:34 +0100 (Sun, 16 Aug 2009)
New Revision: 10823
Log:
Fix a couple of errors in the revised XML generation that were
spotted by Ashley Pittman:
* If I specify --xml-file=<file> but not --xml=yes I get partial
output in the xml file.
* Using log file qualifiers with XML results in the xml for the
qualifier being put to stdout.
Modified:
trunk/coregrind/m_main.c
Modified: trunk/coregrind/m_main.c
===================================================================
--- trunk/coregrind/m_main.c 2009-08-15 22:41:51 UTC (rev 10822)
+++ trunk/coregrind/m_main.c 2009-08-15 23:05:34 UTC (rev 10823)
@@ -950,10 +950,11 @@
i++;
}
- VG_(message_no_f_c)(Vg_UserMsg,
- "<logfilequalifier> <var>%t</var> "
- "<value>%t</value> </logfilequalifier>\n",
- qualname,qual);
+ VG_(printf_xml_no_f_c)(
+ "<logfilequalifier> <var>%t</var> "
+ "<value>%t</value> </logfilequalifier>\n",
+ qualname,qual
+ );
format[i] = '}';
i++;
}
@@ -2422,7 +2423,8 @@
VG_TDICT_CALL(tool_fini, 0/*exitcode*/);
/* Show the error counts. */
- if (VG_(needs).core_errors || VG_(needs).tool_errors) {
+ if (VG_(clo_xml)
+ && (VG_(needs).core_errors || VG_(needs).tool_errors)) {
VG_(show_error_counts_as_XML)();
}
|