Re: [PATCH v2 5/6] config: add `git_die_config()` to the config-set API

From: Tanay Abhra <tanayabh@gmail.com>
Date: Jul 25, 2014, 14:12 UTC
Message-ID: <53D265DA.8070702@gmail.com>
In-Reply-To: <vpqvbqlo7s0.fsf@anie.imag.fr>

On 7/25/2014 7:33 PM, Matthieu Moy wrote:

Show 23 quoted lines

> Tanay Abhra <tanayabh@gmail.com> writes:
> 
>> --- a/config.c
>> +++ b/config.c
>> @@ -1403,11 +1403,12 @@ const struct string_list *git_configset_get_value_multi(struct config_set *cs, c
>>  
>>  int git_configset_get_string_const(struct config_set *cs, const char *key, const char **dest)
>>  {
>> -	const char *value;
>> -	if (!git_configset_get_value(cs, key, &value))
>> -		return git_config_string(dest, key, value);
>> -	else
>> -		return 1;
>> +	int ret;
>> +	char *value;
>> +	ret = git_configset_get_string(cs, key, &value);
>> +	if (ret <= 0)
>> +		*dest = (const char*)value;
>> +	return ret;
>>  }
> 
> Isn't this a fixup meant for another series?
>

Though v12 is in pu, Junio commented that git_configset_get_string_const() & git_configset_get_string() can be done more concisely, I was trying to do that but I failed.

Show 12 quoted lines

>>  int git_configset_get_string(struct config_set *cs, const char *key, char **dest)
>> @@ -1418,8 +1419,7 @@ int git_configset_get_string(struct config_set *cs, const char *key, char **dest
>>  			return config_error_nonbool(key);
>>  		*dest = xstrdup(value);
>>  		return 0;
>> -	}
>> -	else
>> +	} else
>>  		return 1;
> 
> Useless churn.
>