[Tarantool-patches] [PATCH] decimal: fix build with GCC 10

Serge Petrenko sergepetrenko at tarantool.org
Fri Jun 5 17:01:25 MSK 2020


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)



More information about the Tarantool-patches mailing list