Commit d8066413 authored by Rémi Duraffort's avatar Rémi Duraffort

bda: little cleanup.

parent 358afe66
...@@ -413,7 +413,7 @@ static int ParsePath( access_t *p_access, const char* psz_module, ...@@ -413,7 +413,7 @@ static int ParsePath( access_t *p_access, const char* psz_module,
const int i_param_count, const char** psz_param, const int* i_type ) const int i_param_count, const char** psz_param, const int* i_type )
{ {
const int MAXPARAM = 40; const int MAXPARAM = 40;
BOOL b_used[MAXPARAM]; bool b_used[MAXPARAM];
char* psz_parser; char* psz_parser;
char* psz_token; char* psz_token;
char* psz_value; char* psz_value;
...@@ -429,7 +429,7 @@ static int ParsePath( access_t *p_access, const char* psz_module, ...@@ -429,7 +429,7 @@ static int ParsePath( access_t *p_access, const char* psz_module,
return VLC_EGENERIC; return VLC_EGENERIC;
} }
for( int i = 0; i < i_param_count; i++ ) for( int i = 0; i < i_param_count; i++ )
b_used[i] = FALSE; b_used[i] = false;
psz_parser = p_access->psz_path; psz_parser = p_access->psz_path;
if( strlen( psz_parser ) <= 0 ) if( strlen( psz_parser ) <= 0 )
return VLC_SUCCESS; return VLC_SUCCESS;
...@@ -446,7 +446,6 @@ static int ParsePath( access_t *p_access, const char* psz_module, ...@@ -446,7 +446,6 @@ static int ParsePath( access_t *p_access, const char* psz_module,
{ {
msg_Warn( p_access, "ParsePath: Unspecified parameter %s", msg_Warn( p_access, "ParsePath: Unspecified parameter %s",
psz_token ); psz_token );
if( psz_token )
free( psz_token ); free( psz_token );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -462,7 +461,6 @@ static int ParsePath( access_t *p_access, const char* psz_module, ...@@ -462,7 +461,6 @@ static int ParsePath( access_t *p_access, const char* psz_module,
if( i_this_param < 0 ) if( i_this_param < 0 )
{ {
msg_Warn( p_access, "ParsePath: Unknown parameter %s", psz_token ); msg_Warn( p_access, "ParsePath: Unknown parameter %s", psz_token );
if( psz_token )
free( psz_token ); free( psz_token );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -470,11 +468,10 @@ static int ParsePath( access_t *p_access, const char* psz_module, ...@@ -470,11 +468,10 @@ static int ParsePath( access_t *p_access, const char* psz_module,
{ {
msg_Warn( p_access, "ParsePath: Duplicate parameter %s", msg_Warn( p_access, "ParsePath: Duplicate parameter %s",
psz_token ); psz_token );
if( psz_token )
free( psz_token ); free( psz_token );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
b_used[i_this_param] = TRUE; b_used[i_this_param] = true;
/* if "=" was found in token then value starts at /* if "=" was found in token then value starts at
* psz_token + i_paramlen + 1 * psz_token + i_paramlen + 1
...@@ -490,14 +487,13 @@ static int ParsePath( access_t *p_access, const char* psz_module, ...@@ -490,14 +487,13 @@ static int ParsePath( access_t *p_access, const char* psz_module,
psz_param[i_this_param] ); psz_param[i_this_param] );
var_Set( p_access, psz_full_name, v_value ); var_Set( p_access, psz_full_name, v_value );
if( psz_token )
free( psz_token ); free( psz_token );
if( i_token_len >= strlen( psz_parser ) ) if( i_token_len >= strlen( psz_parser ) )
break; break;
psz_parser += i_token_len + 1; psz_parser += i_token_len + 1;
i_token_len = strcspn( psz_parser, ":" ); i_token_len = strcspn( psz_parser, ":" );
} }
while( TRUE ); while( true );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
...@@ -94,7 +94,7 @@ BDAGraph::BDAGraph( access_t* p_this ): ...@@ -94,7 +94,7 @@ BDAGraph::BDAGraph( access_t* p_this ):
l_tuner_used(-1), l_tuner_used(-1),
d_graph_register( 0 ) d_graph_register( 0 )
{ {
b_ready = FALSE; b_ready = false;
p_tuning_space = NULL; p_tuning_space = NULL;
p_tune_request = NULL; p_tune_request = NULL;
p_media_control = NULL; p_media_control = NULL;
......
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