Changeset 252c882286e56574f7984bf23ad8b456fc3d9805

Timestamp:

23/09/08 00:04:18 (2 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1222121058 +0200

git-parent:

[897a63f65b1af3abf8038f02a6bd3f2491bc3eeb]

git-author:

Laurent Aimar <fenrir@videolan.org> 1222121058 +0200

Message:

Use resolve_xml_special_chars where appropriate.

(noticed by Antoine Cellerier)

Files:

• modules/misc/freetype.c (modified) (1 diff)
• modules/misc/quartztext.c (modified) (1 diff)
• modules/misc/text_renderer.h (modified) (2 diffs)

modules/misc/freetype.c

@@ -41 +41 @@
-#include <vlc_xml.h>
-#include <vlc_input.h>
+#include <vlc_strings.h>
-
-#include <math.h>

modules/misc/quartztext.c

@@ -39 +39 @@
-#include <vlc_xml.h>
-#include <vlc_input.h>
+#include <vlc_strings.h>
-
-#include <math.h>

modules/misc/text_renderer.h

@@ -495 +495 @@
-
-/* */
-static void HandleMarkup( char *psz_node )
-{
-    static const struct
-    {
-        const char *psz_pattern;
-        char i_char;
-    } p_replace[] = {
-        { "&lt;",   '<' },
-        { "&gt;",   '>' },
-        { "&amp;",  '&' },
-        { "&quot;", '"' },
-        /* This one will always match */
-        { "&",      '&' }
-    };
-
-    char *s = psz_node;
-    while( ( s = strchr( s, '&' ) ) != NULL )
-    {
-        size_t i_size;
-        int i;
-        for( i = 0; ; i++ )
-        {
-            i_size = strlen(p_replace[i].psz_pattern);
-            if( !strncmp( s, p_replace[i].psz_pattern, i_size ) )
-                break;
-        }
-        if( i_size > 1 )
-            memmove( &s[1], &s[i_size],
-                     strlen( s ) - i_size + 1 );
-        *s++ = p_replace[i].i_char;
-    }
-}
-
-static int ProcessNodes( filter_t *p_filter,
-                         xml_reader_t *p_xml_reader,
@@ -655 +622 @@
-                    /* */
-                    HandleWhiteSpace( psz_node );
-HandleMarkup
+resolve_xml_special_chars
-
-                    SetupLine( p_filter, psz_node, &psz_text,