Browse Source

don't print some raw descriptors in XML

As it conflicts with XML special characters.
master
Christophe Massiot 8 years ago
parent
commit
d544e6795b
3 changed files with 6 additions and 9 deletions
  1. +1
    -2
      dvb/si/desc_64.h
  2. +2
    -3
      dvb/si/desc_66.h
  3. +3
    -4
      dvb/si/desc_67.h

+ 1
- 2
dvb/si/desc_64.h View File

@ -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;

+ 2
- 3
dvb/si/desc_66.h View File

@ -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:

+ 3
- 4
dvb/si/desc_67.h View File

@ -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:

Loading…
Cancel
Save