Re: [PATCH v3 04/12] refs.c: refactor get_submodule_ref_store(), share common free block

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 04/19/2017 01:01 PM, Nguyễn Thái Ngọc Duy wrote:
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx>
> ---
>  refs.c | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/refs.c b/refs.c
> index 5d31fb6bcf..5902a3d9e5 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -1570,19 +1570,16 @@ struct ref_store *get_submodule_ref_store(const char *submodule)
>  
>  	refs = lookup_ref_store_map(&submodule_ref_stores, submodule);
>  	if (refs)
> -		return refs;
> +		goto done;
>  
>  	strbuf_addstr(&submodule_sb, submodule);
>  	ret = is_nonbare_repository_dir(&submodule_sb);
> -	strbuf_release(&submodule_sb);
>  	if (!ret)
> -		return NULL;
> +		goto done;
>  
>  	ret = submodule_to_gitdir(&submodule_sb, submodule);
> -	if (ret) {
> -		strbuf_release(&submodule_sb);
> -		return NULL;
> -	}
> +	if (ret)
> +		goto done;

After this change, the temporary variable `ret` could be eliminated.

> [...]

Michael




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]