|
From: <sv...@va...> - 2005-08-09 22:03:16
|
Author: sewardj
Date: 2005-08-09 23:03:08 +0100 (Tue, 09 Aug 2005)
New Revision: 4356
Log:
Print all XML output with a consistent nesting style, so as to make it
easier to compare it to the output of other XML generating tools.
Regtest expected-output changes to follow.
Modified:
trunk/coregrind/m_errormgr.c
trunk/coregrind/m_main.c
Modified: trunk/coregrind/m_errormgr.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_errormgr.c 2005-08-09 21:50:18 UTC (rev 4355)
+++ trunk/coregrind/m_errormgr.c 2005-08-09 22:03:08 UTC (rev 4356)
@@ -684,8 +684,10 @@
any_supp =3D True;
if (VG_(clo_xml)) {
VG_(message)(Vg_DebugMsg,=20
- " <pair> <count>%d</count> "
- "<name>%t</name> </pair>",=20
+ " <pair>\n"
+ " <count>%d</count>\n"
+ " <name>%t</name>\n"
+ " </pair>",=20
su->count, su->sname);
} else {
VG_(message)(Vg_DebugMsg, "supp: %4d %s", su->count, su->sname)=
;
@@ -798,8 +800,10 @@
if (err->count <=3D 0)
continue;
VG_(message)(
- Vg_UserMsg, " <pair> <count>%d</count> "
- "<unique>0x%llx</unique> </pair>",
+ Vg_UserMsg, " <pair>\n"
+ " <count>%d</count>\n"
+ " <unique>0x%llx</unique>\n"
+ " </pair>",
err->count, err->unique
);
}
Modified: trunk/coregrind/m_main.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_main.c 2005-08-09 21:50:18 UTC (rev 4355)
+++ trunk/coregrind/m_main.c 2005-08-09 22:03:08 UTC (rev 4356)
@@ -2830,8 +2830,11 @@
if (VG_(clo_xml)) {
HChar buf[50];
VG_(ctime)(buf);
- VG_(message)(Vg_UserMsg, "<status> <state>RUNNING</state> "
- "<time>%t</time> </status>", buf);
+ VG_(message)(Vg_UserMsg, "<status>\n"
+ " <state>RUNNING</state>\n"
+ " <time>%t</time>\n"
+ "</status>",=20
+ buf);
VG_(message)(Vg_UserMsg, "");
}
=20
@@ -2932,8 +2935,11 @@
VG_(message)(Vg_UserMsg, "");
}
VG_(ctime)(buf);
- VG_(message)(Vg_UserMsg, "<status> <state>FINISHED</state> "
- "<time>%t</time> </status>", buf);
+ VG_(message)(Vg_UserMsg, "<status>\n"
+ " <state>FINISHED</state>\n"
+ " <time>%t</time>\n"
+ "</status>",=20
+ buf);
VG_(message)(Vg_UserMsg, "");
}
=20
|