  
     if (VG_(clo_xml)) {
        VG_(printf_xml)("<?xml version=\"1.0\"?>\n");
-@@ -1013,7 +997,7 @@
+@@ -1013,7 +1013,7 @@
        VG_(printf_xml)("\n");
     }
  

       }
  
       else if VG_STR_CLO(arg, "--log-socket", log_fsname_unexpanded) {
@@ -716,29 +760,7 @@
          break;
 
       case VgLogTo_File: {

    Int    i, tmp_log_fd, tmp_xml_fd;
    Int    toolname_len = VG_(strlen)(toolname);
    Char*  tmp_str;         // Used in a couple of places.
@@ -514,9 +570,13 @@
 
       else if VG_STR_CLO(arg, "--log-file", log_fsname_unexpanded) {
          log_to = VgLogTo_File;
