[vlc-commits] input: remove always NULL argument

Rémi Denis-Courmont git at videolan.org
Wed Feb 20 16:36:17 CET 2019


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Feb 19 22:14:46 2019 +0200| [d5e66a7514fb91011dbfc38d903a97129a1a5b55] | committer: Rémi Denis-Courmont

input: remove always NULL argument

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

 src/input/input.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index d97ecf176d..1e175d5492 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -61,7 +61,7 @@ static  void *Run( void * );
 static  void *Preparse( void * );
 
 static input_thread_t * Create  ( vlc_object_t *, input_thread_events_cb, void *,
-                                  input_item_t *, const char *, bool, bool,
+                                  input_item_t *, bool, bool,
                                   input_resource_t *, vlc_renderer_item_t * );
 static  int             Init    ( input_thread_t *p_input );
 static void             End     ( input_thread_t *p_input );
@@ -128,7 +128,7 @@ input_thread_t *input_Create( vlc_object_t *p_parent,
                               input_resource_t *p_resource,
                               vlc_renderer_item_t *p_renderer )
 {
-    return Create( p_parent, events_cb, events_data, p_item, NULL, false,
+    return Create( p_parent, events_cb, events_data, p_item, false,
                    false, p_resource, p_renderer );
 }
 
@@ -144,7 +144,7 @@ int input_Read( vlc_object_t *p_parent, input_item_t *p_item,
                 input_thread_events_cb events_cb, void *events_data )
 {
     input_thread_t *p_input = Create( p_parent, events_cb, events_data, p_item,
-                                      NULL, false, false, NULL, NULL );
+                                      false, false, NULL, NULL );
     if( !p_input )
         return VLC_EGENERIC;
 
@@ -162,14 +162,14 @@ input_thread_t *input_CreatePreparser( vlc_object_t *parent,
                                        input_thread_events_cb events_cb,
                                        void *events_data, input_item_t *item )
 {
-    return Create( parent, events_cb, events_data, item, NULL, true, false, NULL, NULL );
+    return Create( parent, events_cb, events_data, item, true, false, NULL, NULL );
 }
 
 input_thread_t *input_CreateThumbnailer(vlc_object_t *obj,
                                         input_thread_events_cb events_cb,
                                         void *events_data, input_item_t *item)
 {
-    return Create( obj, events_cb, events_data, item, NULL, false, true, NULL, NULL );
+    return Create( obj, events_cb, events_data, item, false, true, NULL, NULL );
 }
 
 /**
@@ -311,7 +311,7 @@ input_item_t *input_GetItem( input_thread_t *p_input )
  *****************************************************************************/
 static input_thread_t *Create( vlc_object_t *p_parent,
                                input_thread_events_cb events_cb, void *events_data,
-                               input_item_t *p_item, const char *psz_header,
+                               input_item_t *p_item,
                                bool b_preparsing, bool b_thumbnailing,
                                input_resource_t *p_resource,
                                vlc_renderer_item_t *p_renderer )
@@ -333,8 +333,6 @@ static input_thread_t *Create( vlc_object_t *p_parent,
     /* Parse input options */
     input_item_ApplyOptions( VLC_OBJECT(p_input), p_item );
 
-    p_input->obj.header = psz_header ? strdup( psz_header ) : NULL;
-
     /* Init Common fields */
     priv->events_cb = events_cb;
     priv->events_data = events_data;



More information about the vlc-commits mailing list