Re: [dpdk-dev] [PATCH 07/11] kvargs: be strict when matching a key

["Richardson, Bruce" <bruce.richardson@intel.com>]

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Olivier Matz
> Sent: Tuesday, January 28, 2014 4:07 PM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH 07/11] kvargs: be strict when matching a key
> 
> When we match a key in is_valid_key() and rte_kvargs_process(), do a strict
> comparison (strcmp()) instead of using strstr(s1, s2) which tries a find s1 in
> s2. This old behavior could lead to unexpected match, for instance "cola"
> match "chocolate".
> 
> Surprisingly, no patch was needed on rte_kvargs_count() as it already used
> strcmp().
> 
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> ---
>  lib/librte_kvargs/rte_kvargs.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/librte_kvargs/rte_kvargs.c
> index 6aaa316..73034fc 100644
> --- a/lib/librte_kvargs/rte_kvargs.c
> +++ b/lib/librte_kvargs/rte_kvargs.c
> @@ -94,9 +94,10 @@ is_valid_key(const char *valid[], const char
> *key_match)  {
>  	const char **valid_ptr;
> 
> -	for (valid_ptr = valid; *valid_ptr != NULL; valid_ptr++)
> -		if (strstr(key_match, *valid_ptr) != NULL)
> +	for (valid_ptr = valid; *valid_ptr != NULL; valid_ptr++) {
> +		if (strcmp(key_match, *valid_ptr) == 0)
>  			return 1;
> +	}
>  	return 0;
>  }
> 
> @@ -159,7 +160,7 @@ rte_kvargs_process(const struct rte_kvargs *kvlist,
> 
>  	for (i = 0; i < kvlist->count; i++) {
>  		pair = &kvlist->pairs[i];
> -		if (strstr(pair->key, key_match) != NULL) {
> +		if (strcmp(pair->key, key_match) == 0) {
>  			if ((*handler)(pair->value, opaque_arg) < 0)
>  				return -1;
>  		}
> --
> 1.8.4.rc3

Acked-by: Bruce Richardson <bruce.richardson@intel.com>