From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <avtikhon@tarantool.org>
Received: from smtp40.i.mail.ru (smtp40.i.mail.ru [94.100.177.100])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by dev.tarantool.org (Postfix) with ESMTPS id 708FC469710
 for <tarantool-patches@dev.tarantool.org>;
 Sat,  6 Jun 2020 08:31:14 +0300 (MSK)
Date: Sat, 6 Jun 2020 08:31:11 +0300
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Message-ID: <20200606053111.GA14471@hpalx>
References: <20200605140125.25329-1-sergepetrenko@tarantool.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20200605140125.25329-1-sergepetrenko@tarantool.org>
Subject: Re: [Tarantool-patches] [PATCH] decimal: fix build with GCC 10
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: Serge Petrenko <sergepetrenko@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org

Hi Sergey, thanks a lot for the patch, I've successfully checked it
on Fedora 32 and on the full testing process:
  https://gitlab.com/tarantool/tarantool/-/pipelines/153432554

On Fri, Jun 05, 2020 at 05:01:25PM +0300, Serge Petrenko wrote:
> GCC 10 produces the following error:
> cc1: warning: function may return address of local variable [-Wreturn-local-addr]
> 
> Fix it.
> 
> Part-of #4966
> ---
> https://github.com/tarantool/tarantool/issues/4966
> https://github.com/tarantool/tarantool/tree/sp/gh-4966-decimal-build
> 
>  src/lib/core/decimal.c | 8 ++++----
>  src/lib/core/decimal.h | 4 ++--
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/src/lib/core/decimal.c b/src/lib/core/decimal.c
> index c44b2f6a2..019c68338 100644
> --- a/src/lib/core/decimal.c
> +++ b/src/lib/core/decimal.c
> @@ -176,24 +176,24 @@ decimal_to_integer(decimal_t *dec)
>  	return decimal_check_status(dec, &decimal_context);
>  }
>  
> -decimal_t *
> +const decimal_t *
>  decimal_to_int64(const decimal_t *dec, int64_t *num)
>  {
>  	decimal_t d = *dec;
>  	if (decimal_to_integer(&d) == NULL)
>  		return NULL;
>  	*num = decNumberToInt64(&d, &decimal_context);
> -	return decimal_check_status(&d, &decimal_context);
> +	return decimal_check_status(&d, &decimal_context) != NULL ? dec : NULL;
>  }
>  
> -decimal_t *
> +const decimal_t *
>  decimal_to_uint64(const decimal_t *dec, uint64_t *num)
>  {
>  	decimal_t d = *dec;
>  	if (decimal_to_integer(&d) == NULL)
>  		return NULL;
>  	*num = decNumberToUInt64(&d, &decimal_context);
> -	return decimal_check_status(&d, &decimal_context);
> +	return decimal_check_status(&d, &decimal_context) != NULL ? dec : NULL;
>  }
>  
>  int
> diff --git a/src/lib/core/decimal.h b/src/lib/core/decimal.h
> index 9a162c73c..e276344d2 100644
> --- a/src/lib/core/decimal.h
> +++ b/src/lib/core/decimal.h
> @@ -110,11 +110,11 @@ decimal_to_string(const decimal_t *dec);
>   * \param[out] num - the result
>   * @return NULL if \a dec doesn't fit into int64_t
>   */
> -decimal_t *
> +const decimal_t *
>  decimal_to_int64(const decimal_t *dec, int64_t *num);
>  
>  /** \sa decimal_to_int64 */
> -decimal_t *
> +const decimal_t *
>  decimal_to_uint64(const decimal_t *dec, uint64_t *num);
>  
>  /**
> -- 
> 2.24.3 (Apple Git-128)
>