[vlc-devel] commit: dvb: some cleanup. ( Rémi Duraffort )

[git version control]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Fri Aug 28 15:25:45 2009 +0200| [930a9e576536be678078888d19db5b0c6cf77b25] | committer: Rémi Duraffort 

dvb: some cleanup.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=930a9e576536be678078888d19db5b0c6cf77b25
---

 modules/demux/playlist/dvb.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/demux/playlist/dvb.c b/modules/demux/playlist/dvb.c
index 9698689..9a7d6e2 100644
--- a/modules/demux/playlist/dvb.c
+++ b/modules/demux/playlist/dvb.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * dvb.c : DVB channel list import (szap/tzap/czap compatible channel lists)
  *****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
+ * Copyright (C) 2005-20009 the VideoLAN team
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin at videolan.org>
@@ -30,7 +30,6 @@
 
 #include <vlc_common.h>
 #include <vlc_demux.h>
-#include <vlc_interface.h>
 #include <vlc_charset.h>
 
 #include "playlist.h"
@@ -211,8 +210,8 @@ static int ParseLine( char *psz_line, char **ppsz_name,
     while( psz_parse )
     {
         const char *psz_option = NULL;
-        char *psz_end = strchr( psz_parse, ':' );
-        if( psz_end ) { *psz_end = 0; psz_end++; }
+        char *psz_option_end = strchr( psz_parse, ':' );
+        if( psz_option_end ) { *psz_option_end = 0; psz_option_end++; }
 
         if( i_count == 0 )
         {
@@ -278,7 +277,7 @@ static int ParseLine( char *psz_line, char **ppsz_name,
                              psz_dup );
         }
 
-        psz_parse = psz_end;
+        psz_parse = psz_option_end;
         i_count++;
     }