X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdvb%2Fdvb.h;h=bf059d02a1e929a5628d1888b6ed2a6875002f5b;hb=dea4f0a1b9ca2132ac32b2b31b0b6063a03c8bc0;hp=e8b448e317e09d838f033c748bf9e0dca71364e3;hpb=f09152bc5946020f2b0d368698cc7a564eb3834e;p=vlc diff --git a/modules/access/dvb/dvb.h b/modules/access/dvb/dvb.h index e8b448e317..bf059d02a1 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; @@ -182,7 +182,7 @@ struct access_sys_t vlc_mutex_t httpd_mutex; vlc_cond_t httpd_cond; mtime_t i_httpd_timeout; - bool b_request_frontend_info, b_request_mmi_info; + bool b_request_frontend_info, b_request_mmi_info; char *psz_frontend_info, *psz_mmi_info; char *psz_request; #endif @@ -240,13 +240,13 @@ void en50221_SendMMIObject( access_t * p_access, int i_slot, en50221_mmi_object_t *p_object ); void en50221_End( access_t * ); -char *dvbsi_to_utf8( char *psz_instring, size_t i_length ); +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( 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