From: Mark Wielaard <mark@klomp.org>
Date: Wed, 24 Apr 2024 11:20:34 +0000 (+0200)
Subject: VG_(show_open_fds) Only emit empty line when not creating xml output
X-Git-Tag: VALGRIND_3_23_0~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d655a255425a7f8fe4694094c5f18d3ce327cf0;p=thirdparty%2Fvalgrind.git

VG_(show_open_fds) Only emit empty line when not creating xml output

The "empty" line containing '== pid == ' would corrupt the xml output
with --track-fds=yes.
---

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index 625cd639e..0c0f67602 100644
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -989,7 +989,8 @@ void VG_(show_open_fds) (const HChar* when)
 
    }
 
-   VG_(message)(Vg_UserMsg, "\n");
+   if (!VG_(clo_xml))
+      VG_(message)(Vg_UserMsg, "\n");
 }
 
 /* If /proc/self/fd doesn't exist (e.g. you've got a Linux kernel that doesn't