sout: remove impossible NULL check followed by reverse NULL

[vlc] / src / input / access.c

diff --git a/src/input/access.c b/src/input/access.c
index 1132b84d4ad9d10fa9fdb3a2ce0405d7f43d9470..a9b280450de6fc0997c2e1e31a88d3221983e898 100644 (file)
--- a/src/input/access.c
+++ b/src/input/access.c
@@ -1,24 +1,24 @@
 /*****************************************************************************
  * access.c
  *****************************************************************************
- * Copyright (C) 1999-2008 the VideoLAN team
+ * Copyright (C) 1999-2008 VLC authors and VideoLAN
  * $Id$
  *
  * Author: Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -28,9 +28,10 @@
 #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 *get_path(const char *location)
 {
     char *url, *path;
 
@@ -45,15 +46,16 @@ static char *get_path(const char *location)
     return path;
 }
 
+#undef access_New
 /*****************************************************************************
  * access_New:
  *****************************************************************************/
-access_t *__access_New( vlc_object_t *p_obj, input_thread_t *p_parent_input,
-                        const char *psz_access, const char *psz_demux,
-                        const char *psz_location )
+access_t *access_New( vlc_object_t *p_obj, input_thread_t *p_parent_input,
+                      const char *psz_access, const char *psz_demux,
+                      const char *psz_location )
 {
     access_t *p_access = vlc_custom_create( p_obj, sizeof (*p_access),
-                                            VLC_OBJECT_GENERIC, "access" );
+                                            "access" );
 
     if( p_access == NULL )
         return NULL;
@@ -76,15 +78,13 @@ access_t *__access_New( vlc_object_t *p_obj, input_thread_t *p_parent_input,
 
     p_access->pf_read    = NULL;
     p_access->pf_block   = NULL;
+    p_access->pf_readdir = NULL;
     p_access->pf_seek    = NULL;
     p_access->pf_control = NULL;
     p_access->p_sys      = NULL;
 
     access_InitFields( p_access );
 
-    /* Before module_need (for var_Create...) */
-    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 )
         goto error;