Skip to content

V
vlc
Commit 423954f0 authored by Antoine Cellerier's avatar Antoine Cellerier
Browse files
Options

Further optimize function 

we already know that the string starts with a &
parent c9b87bed
Hide whitespace changes
Inline Side-by-side
Showing with 137 additions and 135 deletions
src/text/strings.c
View file @ 423954f0
...@@ -239,129 +239,129 @@ char *encode_URI_component( const char *psz_url ) ...@@ -239,129 +239,129 @@ char *encode_URI_component( const char *psz_url )
static const struct xml_entity_s static const struct xml_entity_s
{ {
char psz_entity[9]; char psz_entity[8];
uint8_t i_length; uint8_t i_length;
char psz_char[4]; char psz_char[4];
} p_xml_entities[] = { } p_xml_entities[] = {
/* Important: this list has to be in alphabetical order (psz_entity-wise) */ /* Important: this list has to be in alphabetical order (psz_entity-wise) */
{ "Æ", 7, "Æ" }, { "AElig;", 6, "Æ" },
{ "Á", 8, "Á" }, { "Aacute;", 7, "Á" },
{ "Â", 7, "Â" }, { "Acirc;", 6, "Â" },
{ "À", 8, "À" }, { "Agrave;", 7, "À" },
{ "Å", 7, "Å" }, { "Aring;", 6, "Å" },
{ "Ã", 8, "Ã" }, { "Atilde;", 7, "Ã" },
{ "Ä", 6, "Ä" }, { "Auml;", 5, "Ä" },
{ "Ç", 8, "Ç" }, { "Ccedil;", 7, "Ç" },
{ "‡", 8, "‡" }, { "Dagger;", 7, "‡" },
{ "Ð", 5, "Ð" }, { "ETH;", 4, "Ð" },
{ "É", 8, "É" }, { "Eacute;", 7, "É" },
{ "Ê", 7, "Ê" }, { "Ecirc;", 6, "Ê" },
{ "È", 8, "È" }, { "Egrave;", 7, "È" },
{ "Ë", 6, "Ë" }, { "Euml;", 5, "Ë" },
{ "Í", 8, "Í" }, { "Iacute;", 7, "Í" },
{ "Î", 7, "Î" }, { "Icirc;", 6, "Î" },
{ "Ì", 8, "Ì" }, { "Igrave;", 7, "Ì" },
{ "Ï", 6, "Ï" }, { "Iuml;", 5, "Ï" },
{ "Ñ", 8, "Ñ" }, { "Ntilde;", 7, "Ñ" },
{ "Œ", 7, "Œ" }, { "OElig;", 6, "Œ" },
{ "Ó", 8, "Ó" }, { "Oacute;", 7, "Ó" },
{ "Ô", 7, "Ô" }, { "Ocirc;", 6, "Ô" },
{ "Ò", 8, "Ò" }, { "Ograve;", 7, "Ò" },
{ "Ø", 8, "Ø" }, { "Oslash;", 7, "Ø" },
{ "Õ", 8, "Õ" }, { "Otilde;", 7, "Õ" },
{ "Ö", 6, "Ö" }, { "Ouml;", 5, "Ö" },
{ "Š", 8, "Š" }, { "Scaron;", 7, "Š" },
{ "Þ", 7, "Þ" }, { "THORN;", 6, "Þ" },
{ "Ú", 8, "Ú" }, { "Uacute;", 7, "Ú" },
{ "Û", 7, "Û" }, { "Ucirc;", 6, "Û" },
{ "Ù", 8, "Ù" }, { "Ugrave;", 7, "Ù" },
{ "Ü", 6, "Ü" }, { "Uuml;", 5, "Ü" },
{ "Ý", 8, "Ý" }, { "Yacute;", 7, "Ý" },
{ "Ÿ", 6, "Ÿ" }, { "Yuml;", 5, "Ÿ" },
{ "á", 8, "á" }, { "aacute;", 7, "á" },
{ "â", 7, "â" }, { "acirc;", 6, "â" },
{ "´", 7, "´" }, { "acute;", 6, "´" },
{ "æ", 7, "æ" }, { "aelig;", 6, "æ" },
{ "à", 8, "à" }, { "agrave;", 7, "à" },
{ "å", 7, "å" }, { "aring;", 6, "å" },
{ "ã", 8, "ã" }, { "atilde;", 7, "ã" },
{ "ä", 6, "ä" }, { "auml;", 5, "ä" },
{ "„", 7, "„" }, { "bdquo;", 6, "„" },
{ "¦", 8, "¦" }, { "brvbar;", 7, "¦" },
{ "ç", 8, "ç" }, { "ccedil;", 7, "ç" },
{ "¸", 7, "¸" }, { "cedil;", 6, "¸" },
{ "¢", 6, "¢" }, { "cent;", 5, "¢" },
{ "ˆ", 6, "ˆ" }, { "circ;", 5, "ˆ" },
{ "©", 6, "©" }, { "copy;", 5, "©" },
{ "¤", 8, "¤" }, { "curren;", 7, "¤" },
{ "†", 8, "†" }, { "dagger;", 7, "†" },
{ "°", 5, "°" }, { "deg;", 4, "°" },
{ "÷", 8, "÷" }, { "divide;", 7, "÷" },
{ "é", 8, "é" }, { "eacute;", 7, "é" },
{ "ê", 7, "ê" }, { "ecirc;", 6, "ê" },
{ "è", 8, "è" }, { "egrave;", 7, "è" },
{ "ð", 5, "ð" }, { "eth;", 4, "ð" },
{ "ë", 6, "ë" }, { "euml;", 5, "ë" },
{ "€", 6, "€" }, { "euro;", 5, "€" },
{ "½", 8, "½" }, { "frac12;", 7, "½" },
{ "¼", 8, "¼" }, { "frac14;", 7, "¼" },
{ "¾", 8, "¾" }, { "frac34;", 7, "¾" },
{ "…", 8, "…" }, { "hellip;", 7, "…" },
{ "í", 8, "í" }, { "iacute;", 7, "í" },
{ "î", 7, "î" }, { "icirc;", 6, "î" },
{ "¡", 7, "¡" }, { "iexcl;", 6, "¡" },
{ "ì", 8, "ì" }, { "igrave;", 7, "ì" },
{ "¿", 8, "¿" }, { "iquest;", 7, "¿" },
{ "ï", 6, "ï" }, { "iuml;", 5, "ï" },
{ "«", 7, "«" }, { "laquo;", 6, "«" },
{ "“", 7, "“" }, { "ldquo;", 6, "“" },
{ "‹", 8, "‹" }, { "lsaquo;", 7, "‹" },
{ "‘", 7, "‘" }, { "lsquo;", 6, "‘" },
{ "¯", 6, "¯" }, { "macr;", 5, "¯" },
{ "—", 7, "—" }, { "mdash;", 6, "—" },
{ "µ", 7, "µ" }, { "micro;", 6, "µ" },
{ "·", 8, "·" }, { "middot;", 7, "·" },
{ "–", 7, "–" }, { "ndash;", 6, "–" },
{ "¬", 5, "¬" }, { "not;", 4, "¬" },
{ "ñ", 8, "ñ" }, { "ntilde;", 7, "ñ" },
{ "ó", 8, "ó" }, { "oacute;", 7, "ó" },
{ "ô", 7, "ô" }, { "ocirc;", 6, "ô" },
{ "œ", 7, "œ" }, { "oelig;", 6, "œ" },
{ "ò", 8, "ò" }, { "ograve;", 7, "ò" },
{ "ª", 6, "ª" }, { "ordf;", 5, "ª" },
{ "º", 6, "º" }, { "ordm;", 5, "º" },
{ "ø", 8, "ø" }, { "oslash;", 7, "ø" },
{ "õ", 8, "õ" }, { "otilde;", 7, "õ" },
{ "ö", 6, "ö" }, { "ouml;", 5, "ö" },
{ "¶", 6, "¶" }, { "para;", 5, "¶" },
{ "‰", 8, "‰" }, { "permil;", 7, "‰" },
{ "±", 8, "±" }, { "plusmn;", 7, "±" },
{ "£", 7, "£" }, { "pound;", 6, "£" },
{ "»", 7, "»" }, { "raquo;", 6, "»" },
{ "”", 7, "”" }, { "rdquo;", 6, "”" },
{ "®", 5, "®" }, { "reg;", 4, "®" },
{ "›", 8, "›" }, { "rsaquo;", 7, "›" },
{ "’", 7, "’" }, { "rsquo;", 6, "’" },
{ "‚", 7, "‚" }, { "sbquo;", 6, "‚" },
{ "š", 8, "š" }, { "scaron;", 7, "š" },
{ "§", 6, "§" }, { "sect;", 5, "§" },
{ "­", 5, "­" }, { "shy;", 4, "­" },
{ "¹", 6, "¹" }, { "sup1;", 5, "¹" },
{ "²", 6, "²" }, { "sup2;", 5, "²" },
{ "³", 6, "³" }, { "sup3;", 5, "³" },
{ "ß", 7, "ß" }, { "szlig;", 6, "ß" },
{ "þ", 7, "þ" }, { "thorn;", 6, "þ" },
{ "˜", 7, "˜" }, { "tilde;", 6, "˜" },
{ "×", 7, "×" }, { "times;", 6, "×" },
{ "™", 7, "™" }, { "trade;", 6, "™" },
{ "ú", 8, "ú" }, { "uacute;", 7, "ú" },
{ "û", 7, "û" }, { "ucirc;", 6, "û" },
{ "ù", 8, "ù" }, { "ugrave;", 7, "ù" },
{ "¨", 5, "¨" }, { "uml;", 4, "¨" },
{ "ü", 6, "ü" }, { "uuml;", 5, "ü" },
{ "ý", 8, "ý" }, { "yacute;", 7, "ý" },
{ "¥", 5, "¥" }, { "yen;", 4, "¥" },
{ "ÿ", 6, "ÿ" }, { "yuml;", 5, "ÿ" },
}; };
/** /**
...@@ -376,19 +376,20 @@ void resolve_xml_special_chars( char *psz_value ) ...@@ -376,19 +376,20 @@ void resolve_xml_special_chars( char *psz_value )
{ {
if( *psz_value == '&' ) if( *psz_value == '&' )
{ {
#define TRY_CHAR( src, len, dst ) \ char *psz_value1 = psz_value + 1;
if( !strncmp( psz_value, src, len ) ) \ #define TRY_CHAR( src, len, dst ) \
{ \ if( !strncmp( psz_value1, src, len ) ) \
*p_pos = dst; \ { \
psz_value += len; \ *p_pos = dst; \
psz_value += len; \
} }
TRY_CHAR( "&lt;", 4, '<' ) TRY_CHAR( "lt;", 4, '<' )
else TRY_CHAR( "&amp;", 5, '&' ) else TRY_CHAR( "amp;", 5, '&' )
else TRY_CHAR( "&apos;", 6, '\'' ) else TRY_CHAR( "apos;", 6, '\'' )
else TRY_CHAR( "&gt;", 4, '>' ) else TRY_CHAR( "gt;", 4, '>' )
else TRY_CHAR( "&quot;", 6, '"' ) else TRY_CHAR( "quot;", 6, '"' )
#undef TRY_CHAR #undef TRY_CHAR
else if( psz_value[1] == '#' ) else if( *psz_value1 == '#' )
{ {
char *psz_end; char *psz_end;
int i = strtol( psz_value+2, &psz_end, 10 ); int i = strtol( psz_value+2, &psz_end, 10 );
...@@ -427,14 +428,15 @@ void resolve_xml_special_chars( char *psz_value ) ...@@ -427,14 +428,15 @@ void resolve_xml_special_chars( char *psz_value )
if( i >= i_entities ) if( i >= i_entities )
cmp = -1; cmp = -1;
else else
cmp = strncmp( psz_value, p_xml_entities[i].psz_entity, cmp = strncmp( psz_value1, /* Skip the & */
p_xml_entities[i].psz_entity,
p_xml_entities[i].i_length ); p_xml_entities[i].i_length );
if( cmp == 0 ) if( cmp == 0 )
{ {
strncpy( p_pos, p_xml_entities[i].psz_char, size_t i_len = strlen( p_xml_entities[i].psz_char );
p_xml_entities[i].i_length ); strncpy( p_pos, p_xml_entities[i].psz_char, i_len );
p_pos += strlen( p_xml_entities[i].psz_char ) - 1; p_pos += i_len - 1;
psz_value += p_xml_entities[i].i_length; psz_value += p_xml_entities[i].i_length+1;
break; break;
} }
else if( cmp < 0 ) else if( cmp < 0 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment