Use %t rather than %s in some places for constructing XML output.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4188

diff --git a/coregrind/m_errormgr.c b/coregrind/m_errormgr.c
index 7a6f7f88ea21ce1e21cac6de685ab68a03303d09..11e7acbd8e7b72e88d2e389a843e8803c3270676 100644 (file)
--- a/coregrind/m_errormgr.c
+++ b/coregrind/m_errormgr.c
@@ -685,7 +685,7 @@ static Bool show_used_suppressions ( void )
       if (VG_(clo_xml)) {
          VG_(message)(Vg_DebugMsg, 
                       "  <pair> <count>%d</count> "
-                      "<name>%s</name> </pair>", 
+                      "<name>%t</name> </pair>", 
                       su->count, su->sname);
       } else {
          VG_(message)(Vg_DebugMsg, "supp: %4d %s", su->count, su->sname);

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index f9162d9af326e3a2eec7561e307ce87c23934f3f..bd2dd2a8a5bd4d65009142880ac2d5f698efab7a 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -1902,11 +1902,11 @@ static void process_cmd_line_options( UInt* client_auxv, const char* toolname )
       VG_(message)(Vg_UserMsg, "");
       VG_(message)(Vg_UserMsg, "<pid>%d</pid>", VG_(getpid)());
       VG_(message)(Vg_UserMsg, "<ppid>%d</ppid>", VG_(getppid)());
-      VG_(message)(Vg_UserMsg, "<tool>%s</tool>", toolname);
+      VG_(message)(Vg_UserMsg, "<tool>%t</tool>", toolname);
       if (VG_(clo_log_file_qualifier)) {
          HChar* val = VG_(getenv)(VG_(clo_log_file_qualifier));
-         VG_(message)(Vg_UserMsg, "<logfilequalifier> <var>%s</var> "
-                                  "<value>%s</value> </logfilequalifier>",
+         VG_(message)(Vg_UserMsg, "<logfilequalifier> <var>%t</var> "
+                                  "<value>%t</value> </logfilequalifier>",
                                   VG_(clo_log_file_qualifier),
                                   val ? val : "");
       }
@@ -1929,7 +1929,7 @@ static void process_cmd_line_options( UInt* client_auxv, const char* toolname )
       VG_(message)(Vg_UserMsg, "  <argv>");
       for (i = 0; i < VG_(client_argc); i++) {
          HChar* tag = i==0 ? "exe" : "arg";
-         VG_(message)(Vg_UserMsg, "    <%s>%s</%s>", 
+         VG_(message)(Vg_UserMsg, "    <%s>%t</%s>", 
                                   tag, VG_(client_argv)[i], tag);
       }
       VG_(message)(Vg_UserMsg, "  </argv>");
@@ -2809,7 +2809,7 @@ int main(int argc, char **argv, char **envp)
       HChar buf[50];
       VG_(ctime)(buf);
       VG_(message)(Vg_UserMsg, "<status> <what>RUNNING</what> "
-                               "<when>%s</when> </status>", buf);
+                               "<when>%t</when> </status>", buf);
       VG_(message)(Vg_UserMsg, "");
    }
 
@@ -2911,7 +2911,7 @@ void VG_(shutdown_actions_NORETURN) ( ThreadId tid,
       }
       VG_(ctime)(buf);
       VG_(message)(Vg_UserMsg, "<status> <what>FINISHED</what> "
-                               "<when>%s</when> </status>", buf);
+                               "<when>%t</when> </status>", buf);
       VG_(message)(Vg_UserMsg, "");
    }
 

diff --git a/memcheck/mac_leakcheck.c b/memcheck/mac_leakcheck.c
index e55d92db5e9601f5ee1a73de5107ed8f4b575a91..5ae719ed7d6cc74c7c797882b071e4ffdc6362ef 100644 (file)
--- a/memcheck/mac_leakcheck.c
+++ b/memcheck/mac_leakcheck.c
@@ -233,7 +233,7 @@ void MAC_(pp_LeakError)(void* vextra)
    const Char *loss = str_lossmode(l->loss_mode);
 
    if (VG_(clo_xml)) {
-      VG_(message)(Vg_UserMsg, "  <kind>%s</kind>", xml_kind(l->loss_mode));
+      VG_(message)(Vg_UserMsg, "  <kind>%t</kind>", xml_kind(l->loss_mode));
    } else {
       VG_(message)(Vg_UserMsg, "");
    }