Commit 8fb9c70f authored by Rafaël Carré's avatar Rafaël Carré

config_ChainCreate() : use SKIPSPACE macro

parent ea4b6069
...@@ -186,7 +186,7 @@ char *config_ChainCreate( char **ppsz_name, config_chain_t **pp_cfg, ...@@ -186,7 +186,7 @@ char *config_ChainCreate( char **ppsz_name, config_chain_t **pp_cfg,
if( !psz_chain ) if( !psz_chain )
return NULL; return NULL;
psz_chain += strspn( psz_chain, " \t" ); SKIPSPACE( psz_chain );
/* Look for parameter (a {...} or :...) or end of name (space or nul) */ /* Look for parameter (a {...} or :...) or end of name (space or nul) */
len = strcspn( psz_chain, "{: \t" ); len = strcspn( psz_chain, "{: \t" );
...@@ -194,14 +194,14 @@ char *config_ChainCreate( char **ppsz_name, config_chain_t **pp_cfg, ...@@ -194,14 +194,14 @@ char *config_ChainCreate( char **ppsz_name, config_chain_t **pp_cfg,
psz_chain += len; psz_chain += len;
/* Parse the parameters */ /* Parse the parameters */
psz_chain += strspn( psz_chain, " \t" ); SKIPSPACE( psz_chain );
if( *psz_chain == '{' ) if( *psz_chain == '{' )
{ {
/* Parse all name=value[,] elements */ /* Parse all name=value[,] elements */
do do
{ {
psz_chain++; /* skip previous delimiter */ psz_chain++; /* skip previous delimiter */
psz_chain += strspn( psz_chain, " \t" ); SKIPSPACE( psz_chain );
/* Look for the end of the name (,={}_space_) */ /* Look for the end of the name (,={}_space_) */
len = strcspn( psz_chain, "=,{} \t" ); len = strcspn( psz_chain, "=,{} \t" );
...@@ -221,17 +221,17 @@ char *config_ChainCreate( char **ppsz_name, config_chain_t **pp_cfg, ...@@ -221,17 +221,17 @@ char *config_ChainCreate( char **ppsz_name, config_chain_t **pp_cfg,
pp_next = &p_cfg->p_next; pp_next = &p_cfg->p_next;
/* Extract the option value */ /* Extract the option value */
psz_chain += strspn( psz_chain, " \t" ); SKIPSPACE( psz_chain );
if( strchr( "={", *psz_chain ) ) if( strchr( "={", *psz_chain ) )
{ {
p_cfg->psz_value = ChainGetValue( &psz_chain ); p_cfg->psz_value = ChainGetValue( &psz_chain );
psz_chain += strspn( psz_chain, " \t" ); SKIPSPACE( psz_chain );
} }
} }
while( !memchr( "}", *psz_chain, 2 ) ); while( !memchr( "}", *psz_chain, 2 ) );
if( *psz_chain ) psz_chain++; /* skip '}' */; if( *psz_chain ) psz_chain++; /* skip '}' */;
psz_chain += strspn( psz_chain, " \t" ); SKIPSPACE( psz_chain );
} }
if( *psz_chain == ':' ) if( *psz_chain == ':' )
......
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