[vlc-devel] commit: access_dvb: constify. ( Rémi Duraffort )

[git version control]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Fri Oct  2 20:38:40 2009 +0200| [bfbf8a97d8a72d3a4f9ec38e15a52cdc2b9eb93b] | committer: Rémi Duraffort 

access_dvb: constify.

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

 modules/access/dvb/dvb.h  |    6 +++---
 modules/access/dvb/http.c |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/access/dvb/dvb.h b/modules/access/dvb/dvb.h
index ca22326..5e626b2 100644
--- a/modules/access/dvb/dvb.h
+++ b/modules/access/dvb/dvb.h
@@ -132,7 +132,7 @@ static __inline__ void en50221_MMIFree( en50221_mmi_object_t *p_object )
         FREENULL( p_object->u.menu.psz_bottom );
         for ( i = 0; i < p_object->u.menu.i_choices; i++ )
         {
-            FREENULL( p_object->u.menu.ppsz_choices[i] );
+            free( p_object->u.menu.ppsz_choices[i] );
         }
         FREENULL( p_object->u.menu.ppsz_choices );
         break;
@@ -245,8 +245,8 @@ char *dvbsi_to_utf8( const char *psz_instring, size_t i_length );
 #ifdef ENABLE_HTTPD
 int HTTPOpen( access_t *p_access );
 void HTTPClose( access_t *p_access );
-char *HTTPExtractValue( const char *psz_uri, const char *psz_name,
-                        char *psz_value, int i_value_max );
+const char *HTTPExtractValue( const char *psz_uri, const char *psz_name,
+                              char *psz_value, int i_value_max );
 #endif
 /*****************************************************************************
  * Hacks
diff --git a/modules/access/dvb/http.c b/modules/access/dvb/http.c
index b9e9950..46eae81 100644
--- a/modules/access/dvb/http.c
+++ b/modules/access/dvb/http.c
@@ -300,10 +300,10 @@ static int HttpCallback( httpd_file_sys_t *p_args,
 /****************************************************************************
  * HTTPExtractValue: Extract a GET variable from psz_request
  ****************************************************************************/
-char *HTTPExtractValue( const char *psz_uri, const char *psz_name,
+const char *HTTPExtractValue( const char *psz_uri, const char *psz_name,
                         char *psz_value, int i_value_max )
 {
-    char *p = psz_uri;
+    const char *p = psz_uri;
 
     while( (p = strstr( p, psz_name )) )
     {