Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / input / access.c

diff --git a/src/input/access.c b/src/input/access.c
index 82d27b5a01f20c7d7138a705ef8ec8ecd291e422..b8a2f031e3652a1df4503113de9c17744052c3dc 100644 (file)
--- a/src/input/access.c
+++ b/src/input/access.c
@@ -28,13 +28,14 @@
 #include "access.h"
 #include <libvlc.h>
 #include <vlc_url.h>
+#include <vlc_modules.h>
 
 /* Decode URL (which has had its scheme stripped earlier) to a file path. */
 static char *get_path(const char *location)
 {
     char *url, *path;
 
-    /* Appending "file://" is a bit hackish. But then again, we do not want
+    /* Prepending "file://" is a bit hackish. But then again, we do not want
      * to hard-code the list of schemes that use file paths in make_path().
      */
     if (asprintf(&url, "file://%s", location) == -1)
@@ -63,12 +64,16 @@ access_t *__access_New( vlc_object_t *p_obj, input_thread_t *p_parent_input,
     p_access->p_input = p_parent_input;
 
     p_access->psz_access = strdup( psz_access );
-    p_access->psz_path   = strdup( psz_location );
+    p_access->psz_location = strdup( psz_location );
     p_access->psz_filepath = get_path( psz_location );
     p_access->psz_demux  = strdup( psz_demux );
+    if( p_access->psz_access == NULL || p_access->psz_location == NULL
+     || p_access->psz_demux == NULL )
+        goto error;
 
     msg_Dbg( p_obj, "creating access '%s' location='%s', path='%s'",
-             psz_access, psz_location, p_access->psz_filepath );
+             psz_access, psz_location,
+             p_access->psz_filepath ? p_access->psz_filepath : "(null)" );
 
     p_access->pf_read    = NULL;
     p_access->pf_block   = NULL;
@@ -82,18 +87,18 @@ access_t *__access_New( vlc_object_t *p_obj, input_thread_t *p_parent_input,
     vlc_object_attach( p_access, p_obj );
 
     p_access->p_module = module_need( p_access, "access", psz_access, true );
-
     if( p_access->p_module == NULL )
-    {
-        free( p_access->psz_access );
-        free( p_access->psz_path );
-        free( p_access->psz_filepath );
-        free( p_access->psz_demux );
-        vlc_object_release( p_access );
-        return NULL;
-    }
+        goto error;
 
     return p_access;
+
+error:
+    free( p_access->psz_access );
+    free( p_access->psz_location );
+    free( p_access->psz_filepath );
+    free( p_access->psz_demux );
+    vlc_object_release( p_access );
+    return NULL;
 }
 
 /*****************************************************************************
@@ -104,7 +109,7 @@ void access_Delete( access_t *p_access )
     module_unneed( p_access, p_access->p_module );
 
     free( p_access->psz_access );
-    free( p_access->psz_path );
+    free( p_access->psz_location );
     free( p_access->psz_filepath );
     free( p_access->psz_demux );