Commit 6094cb67 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Cleanup MRLParse

parent 28dd999c
...@@ -127,7 +127,7 @@ char *ExtractURIString( const char *restrict psz_uri, ...@@ -127,7 +127,7 @@ char *ExtractURIString( const char *restrict psz_uri,
int TestURIParam( char *psz_uri, const char *psz_name ); int TestURIParam( char *psz_uri, const char *psz_name );
/** This function parses a MRL */ /** This function parses a MRL */
input_item_t *MRLParse( intf_thread_t *, char *psz, char *psz_name ); input_item_t *MRLParse( intf_thread_t *, const char *psz, char *psz_name );
/** Return the first word from a string (works in-place) */ /** Return the first word from a string (works in-place) */
char *FirstWord( char *psz, char *new ); char *FirstWord( char *psz, char *new );
......
...@@ -820,14 +820,12 @@ static char *FirstOption( char *psz, char *new ) ...@@ -820,14 +820,12 @@ static char *FirstOption( char *psz, char *new )
return NULL; return NULL;
} }
input_item_t *MRLParse( intf_thread_t *p_intf, char *_psz, input_item_t *MRLParse( intf_thread_t *p_intf, const char *mrl,
char *psz_name ) char *psz_name )
{ {
char *psz = strdup( _psz ); char *psz = strdup( mrl ), *s_mrl = psz, *s_temp;
char *s_mrl = psz; if( psz == NULL )
char *s_temp; return NULL;
input_item_t * p_input = NULL;
/* extract the mrl */ /* extract the mrl */
s_temp = FirstOption( s_mrl, s_mrl ); s_temp = FirstOption( s_mrl, s_mrl );
if( s_temp == NULL ) if( s_temp == NULL )
...@@ -835,7 +833,9 @@ input_item_t *MRLParse( intf_thread_t *p_intf, char *_psz, ...@@ -835,7 +833,9 @@ input_item_t *MRLParse( intf_thread_t *p_intf, char *_psz,
s_temp = s_mrl + strlen( s_mrl ); s_temp = s_mrl + strlen( s_mrl );
} }
p_input = input_item_New( p_intf, s_mrl, psz_name ); input_item_t *p_input = input_item_New( p_intf, s_mrl, psz_name );
if( p_input == NULL )
return NULL;
s_mrl = s_temp; s_mrl = s_temp;
/* now we can take care of the options */ /* now we can take care of the options */
...@@ -852,7 +852,6 @@ input_item_t *MRLParse( intf_thread_t *p_intf, char *_psz, ...@@ -852,7 +852,6 @@ input_item_t *MRLParse( intf_thread_t *p_intf, char *_psz,
s_mrl = s_temp; s_mrl = s_temp;
} }
free( psz );
return p_input; return p_input;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment