[vlc-devel] commit: Really XML encode the playlist and status contents ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Mar 31 20:25:58 2009 +0300| [959e1e31a64ff8fac1ee4b1bbcbc87a76cb53505] | committer: Rémi Denis-Courmont 

Really XML encode the playlist and status contents

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=959e1e31a64ff8fac1ee4b1bbcbc87a76cb53505
---

 share/http/requests/playlist.xml |   36 ++++++++++++++++++------------------
 share/http/requests/status.xml   |    4 ++--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/share/http/requests/playlist.xml b/share/http/requests/playlist.xml
index 46ecfb9..9de5b1b 100644
--- a/share/http/requests/playlist.xml
+++ b/share/http/requests/playlist.xml
@@ -35,26 +35,26 @@
   <vlc id="end" />
   <vlc id="if" param1="pl.type value 'Node' strcmp" />
     <vlc id="rpn" param1="1 +" />
-    <leaf id="<vlc id="value" param1="pl.index" />" <vlc id="if" param1="pl.current" /> current="current" <vlc id="end" /> uri="<vlc id="value" param1="pl.uri xml_encode" />" name="<vlc id="value" param1="pl.name xml_encode" />" ro="<vlc id="value" param1="pl.ro" />" duration="<vlc id="value" param1="pl.duration" />">
-		<title><![CDATA[<vlc id="value" param1="pl.title xml_encode" />]]></title>
-		<artist><![CDATA[<vlc id="value" param1="pl.artist" xml_encode />]]></artist>
-		<genre><![CDATA[<vlc id="value" param1="pl.genre xml_encode" />]]></genre>
-		<copyright><![CDATA[<vlc id="value" param1="pl.copyright xml_encode" />]]></copyright>
-		<album><![CDATA[<vlc id="value" param1="pl.album xml_encode" />]]></album>
-		<track><![CDATA[<vlc id="value" param1="pl.track xml_encode" />]]></track>
-		<description><![CDATA[<vlc id="value" param1="pl.description xml_encode" />]]></description>
-		<rating><![CDATA[<vlc id="value" param1="pl.rating xml_encode" />]]></rating>
-		<date><![CDATA[<vlc id="value" param1="pl.date xml_encode" />]]></date>
-		<url><![CDATA[<vlc id="value" param1="pl.url xml_encode" />]]></url>
-		<language><![CDATA[<vlc id="value" param1="pl.language xml_encode" />]]></language>
-		<now_playing><![CDATA[<vlc id="value" param1="pl.now_playing xml_encode" />]]></now_playing>
-		<publisher><![CDATA[<vlc id="value" param1="pl.publisher xml_encode" />]]></publisher>
-		<encoded_by><![CDATA[<vlc id="value" param1="pl.encoded_by xml_encode" />]]></encoded_by>
-		<art_url><![CDATA[<vlc id="value" param1="pl.art_url xml_encode" />]]></art_url>
-		<track_id><![CDATA[<vlc id="value" param1="pl.track_id xml_encode" />]]></track_id>
+    <leaf id="<vlc id="value" param1="pl.index" />" <vlc id="if" param1="pl.current" /> current="current" <vlc id="end" /> uri="<vlc id="value" param1="pl.uri value xml_encode" />" name="<vlc id="value" param1="pl.name value xml_encode" />" ro="<vlc id="value" param1="pl.ro" />" duration="<vlc id="value" param1="pl.duration" />">
+		<title><![CDATA[<vlc id="value" param1="pl.title value xml_encode" />]]></title>
+		<artist><![CDATA[<vlc id="value" param1="pl.artist value xml_encode" />]]></artist>
+		<genre><![CDATA[<vlc id="value" param1="pl.genre value xml_encode" />]]></genre>
+		<copyright><![CDATA[<vlc id="value" param1="pl.copyright value xml_encode" />]]></copyright>
+		<album><![CDATA[<vlc id="value" param1="pl.album value xml_encode" />]]></album>
+		<track><![CDATA[<vlc id="value" param1="pl.track value xml_encode" />]]></track>
+		<description><![CDATA[<vlc id="value" param1="pl.description value xml_encode" />]]></description>
+		<rating><![CDATA[<vlc id="value" param1="pl.rating value xml_encode" />]]></rating>
+		<date><![CDATA[<vlc id="value" param1="pl.date value xml_encode" />]]></date>
+		<url><![CDATA[<vlc id="value" param1="pl.url value xml_encode" />]]></url>
+		<language><![CDATA[<vlc id="value" param1="pl.language value xml_encode" />]]></language>
+		<now_playing><![CDATA[<vlc id="value" param1="pl.now_playing value xml_encode" />]]></now_playing>
+		<publisher><![CDATA[<vlc id="value" param1="pl.publisher value xml_encode" />]]></publisher>
+		<encoded_by><![CDATA[<vlc id="value" param1="pl.encoded_by value xml_encode" />]]></encoded_by>
+		<art_url><![CDATA[<vlc id="value" param1="pl.art_url value xml_encode" />]]></art_url>
+		<track_id><![CDATA[<vlc id="value" param1="pl.track_id value xml_encode" />]]></track_id>
 	</leaf>
   <vlc id="else" />
-    <node id="<vlc id="value" param1="pl.index" />" name="<vlc id="value" param1="pl.name xml_encode" />" ro="<vlc id="value" param1="pl.ro" />" >
+    <node id="<vlc id="value" param1="pl.index" />" name="<vlc id="value" param1="pl.name value xml_encode" />" ro="<vlc id="value" param1="pl.ro" />" >
     <vlc id="if" param1="first_item value 0 ="/>
       <vlc id="rpn" param1="first_item 1 store" />
     <vlc id="end"/>
diff --git a/share/http/requests/status.xml b/share/http/requests/status.xml
index 3dd459a..9565034 100644
--- a/share/http/requests/status.xml
+++ b/share/http/requests/status.xml
@@ -117,9 +117,9 @@
   <repeat><vlc id="value" param1="'repeat' 'VLC_OBJECT_PLAYLIST' vlc_var_get" /></repeat>
   <information>
     <vlc id="foreach" param1="inf" param2="information" />
-      <category name="<vlc id="value" param1="inf.name xml_encode" />">
+      <category name="<vlc id="value" param1="inf.name value xml_encode" />">
         <vlc id="foreach" param1="subinf" param2="inf.info" />
-          <info name="<vlc id="value" param1="subinf.name xml_encode" />"><vlc id="value" param1="subinf.value xml_encode" /></info>
+          <info name="<vlc id="value" param1="subinf.name value xml_encode" />"><vlc id="value" param1="subinf.value value xml_encode" /></info>
         <vlc id="end" />
       </category>
     <vlc id="end" />