From d139be2b6d3f3ca2537ce4f110146a55fccf87bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Duraffort?= Date: Mon, 5 Apr 2010 22:46:36 +0200 Subject: [PATCH] Lua: use config_StringEscape. --- modules/misc/lua/vlc.c | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c index e3e2415fab..b5ee416347 100644 --- a/modules/misc/lua/vlc.c +++ b/modules/misc/lua/vlc.c @@ -582,37 +582,6 @@ int __vlclua_playlist_add_internal( vlc_object_t *p_this, lua_State *L, return i_count; } -static char *escape( const char *psz ) -{ - if( !psz ) - return NULL; - - /* Count the number of ' and \ in the string */ - const char *it = psz; - int i_esc = 0; - while( *it != '\0') - { - if( *it == '\'' || *it == '\\' ) - i_esc++; - it++; - } - - if( i_esc == 0 ) - return strdup( psz ); - - char *psz_esc = malloc( strlen( psz ) + i_esc + 1 ); - char *it2 = psz_esc; - it = psz; - while( *it != '\0' ) - { - if( *it == '\'' || *it == '\\' ) - *it2++ = '\\'; - *it2++ = *it++; - } - *it2 = '\0'; - - return psz_esc; -} static int vlc_sd_probe_Open( vlc_object_t *obj ) { vlc_probe_t *probe = (vlc_probe_t *)obj; @@ -697,8 +666,8 @@ static int vlc_sd_probe_Open( vlc_object_t *obj ) } } - char *psz_file_esc = escape( *ppsz_file ); - char *psz_longname_esc = escape( psz_longname ); + char *psz_file_esc = config_StringEscape( *ppsz_file ); + char *psz_longname_esc = config_StringEscape( psz_longname ); if( asprintf( &psz_name, "lua{sd='%s',longname='%s'}", psz_file_esc, psz_longname_esc ) < 0 ) { -- 2.39.5