From d544e6795b472c0966416e6108e1605d3a5c8e46 Mon Sep 17 00:00:00 2001
From: Christophe Massiot <cmassiot@openheadend.tv>
Date: Fri, 4 Nov 2016 22:01:36 +0100
Subject: [PATCH] don't print some raw descriptors in XML

As it conflicts with XML special characters.
---
 dvb/si/desc_64.h | 3 +--
 dvb/si/desc_66.h | 5 ++---
 dvb/si/desc_67.h | 7 +++----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/dvb/si/desc_64.h b/dvb/si/desc_64.h
index a501303..8c86acc 100644
--- a/dvb/si/desc_64.h
+++ b/dvb/si/desc_64.h
@@ -166,12 +166,11 @@ static inline void desc64_print(const uint8_t *p_desc,
         psz_text = dvb_string_xml_escape(psz_text);
         pf_print(print_opaque,
                  "<DATA_BROADCAST_DESC broadcast_id=\"0x%04x\" component_tag=\"%u\""
-                 " selector_byte=\"%s\" selector_byte_txt=\"%s\" lang=\"%3.3s\""
+                 " selector_byte=\"%s\" lang=\"%3.3s\""
                  " text=\"%s\"/>",
                  desc64_get_broadcast_id(p_desc),
                  desc64_get_component_tag(p_desc),
                  psz_selector_byte,
-                 psz_selector_byte_txt,
                  (char *)desc64_get_lang(p_desc),
                  psz_text);
         break;
diff --git a/dvb/si/desc_66.h b/dvb/si/desc_66.h
index 8873e9c..7e0e80f 100644
--- a/dvb/si/desc_66.h
+++ b/dvb/si/desc_66.h
@@ -109,10 +109,9 @@ static inline void desc66_print(const uint8_t *p_desc, f_print pf_print,
     case PRINT_XML:
         pf_print(opaque,
                  "<DATA_BROADCAST_ID_DESC broadcast_id=\"0x%04x\""
-                 " selector_byte=\"%s\" selector_byte_txt=\"%s\"/>",
+                 " selector_byte=\"%s\"/>",
                  desc66_get_broadcast_id(p_desc),
-                 psz_selector_byte,
-                 psz_selector_byte_txt
+                 psz_selector_byte
                 );
         break;
     default:
diff --git a/dvb/si/desc_67.h b/dvb/si/desc_67.h
index 831e2e3..21f486c 100644
--- a/dvb/si/desc_67.h
+++ b/dvb/si/desc_67.h
@@ -99,10 +99,9 @@ static inline void desc67_print(const uint8_t *p_desc, f_print pf_print,
     case PRINT_XML:
         pf_print(opaque,
                  !b_dsng_desc
-                  ? "<TRANSPORT_STREAM_DESC bytes=\"%s\" bytes_txt=\"%s\"/>"
-                  : "<DSNG_DESC bytes=\"%s\" bytes_txt=\"%s\"/>",
-                 psz_bytes,
-                 psz_bytes_txt
+                  ? "<TRANSPORT_STREAM_DESC bytes=\"%s\"/>"
+                  : "<DSNG_DESC bytes=\"%s\"/>",
+                 psz_bytes
                 );
         break;
     default: