Use var_Inherit* instead of var_CreateGet*.

[vlc] / modules / access / dvb / http.c

diff --git a/modules/access/dvb/http.c b/modules/access/dvb/http.c
index d65253e45992c5fede8e23424828dfe5fcaa224f..159a0d72951b18698f87b8f35b076d628275f7f0 100644 (file)
--- a/modules/access/dvb/http.c
+++ b/modules/access/dvb/http.c
@@ -28,18 +28,15 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_access.h>
 
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
 
-#include <fcntl.h>
 #include <sys/types.h>
 
-#include <errno.h>
-
 /* Include dvbpsi headers */
 #ifdef HAVE_DVBPSI_DR_H
 #   include <dvbpsi/dvbpsi.h>
@@ -48,6 +45,8 @@
 #   include <dvbpsi/pmt.h>
 #   include <dvbpsi/dr.h>
 #   include <dvbpsi/psi.h>
+#   include <dvbpsi/demux.h>
+#   include <dvbpsi/sdt.h>
 #else
 #   include "dvbpsi.h"
 #   include "descriptor.h"
@@ -55,11 +54,13 @@
 #   include "tables/pmt.h"
 #   include "descriptors/dr.h"
 #   include "psi.h"
+#   include "demux.h"
+#   include "tables/sdt.h"
 #endif
 
 #ifdef ENABLE_HTTPD
-#   include "vlc_httpd.h"
-#   include "vlc_acl.h"
+#   include <vlc_httpd.h>
+#   include <vlc_acl.h>
 #endif
 
 #include "dvb.h"
@@ -79,7 +80,7 @@ static int HttpCallback( httpd_file_sys_t *p_args,
 /*****************************************************************************
  * HTTPOpen: Start the internal HTTP server
  *****************************************************************************/
-int E_(HTTPOpen)( access_t *p_access )
+int HTTPOpen( access_t *p_access )
 {
     access_sys_t *p_sys = p_access->p_sys;
     char          *psz_address, *psz_cert = NULL, *psz_key = NULL,
@@ -90,8 +91,8 @@ int E_(HTTPOpen)( access_t *p_access )
     vlc_acl_t     *p_acl = NULL;
     httpd_file_sys_t *f;
 
-    vlc_mutex_init( p_access, &p_sys->httpd_mutex );
-    vlc_cond_init( p_access, &p_sys->httpd_cond );
+    vlc_mutex_init( &p_sys->httpd_mutex );
+    vlc_cond_init( &p_sys->httpd_cond );
     p_sys->b_request_frontend_info = p_sys->b_request_mmi_info = false;
     p_sys->i_httpd_timeout = 0;
 
@@ -109,14 +110,14 @@ int E_(HTTPOpen)( access_t *p_access )
         return VLC_SUCCESS;
 
     /* determine SSL configuration */
-    psz_cert = var_GetNonEmptyString( p_access, "dvb-http-intf-cert" );
+    psz_cert = var_InheritString( p_access, "dvb-http-intf-cert" );
     if ( psz_cert != NULL )
     {
         msg_Dbg( p_access, "enabling TLS for HTTP interface (cert file: %s)",
                  psz_cert );
-        psz_key = config_GetPsz( p_access, "dvb-http-intf-key" );
-        psz_ca = config_GetPsz( p_access, "dvb-http-intf-ca" );
-        psz_crl = config_GetPsz( p_access, "dvb-http-intf-crl" );
+        psz_key = var_InheritString( p_access, "dvb-http-intf-key" );
+        psz_ca = var_InheritString( p_access, "dvb-http-intf-ca" );
+        psz_crl = var_InheritString( p_access, "dvb-http-intf-crl" );
 
         if ( i_port <= 0 )
             i_port = 8443;
@@ -194,7 +195,7 @@ int E_(HTTPOpen)( access_t *p_access )
 /*****************************************************************************
  * HTTPClose: Stop the internal HTTP server
  *****************************************************************************/
-void E_(HTTPClose)( access_t *p_access )
+void HTTPClose( access_t *p_access )
 {
     access_sys_t *p_sys = p_access->p_sys;
 
@@ -249,6 +250,7 @@ static int HttpCallback( httpd_file_sys_t *p_args,
                          uint8_t *_psz_request,
                          uint8_t **_pp_data, int *pi_data )
 {
+    VLC_UNUSED(p_file);
     access_sys_t *p_sys = p_args->p_access->p_sys;
     char *psz_request = (char *)_psz_request;
     char **pp_data = (char **)_pp_data;
@@ -295,10 +297,10 @@ static int HttpCallback( httpd_file_sys_t *p_args,
 /****************************************************************************
  * HTTPExtractValue: Extract a GET variable from psz_request
  ****************************************************************************/
-char *E_(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 )
 {
-    char *p = psz_uri;
+    const char *p = psz_uri;
 
     while( (p = strstr( p, psz_name )) )
     {