From cc6c57ad36d1eb12cd6fac15c3b43e4b6f2ae46e Mon Sep 17 00:00:00 2001
From: "Arnold D. Robbins" <arnold@skeeve.com>
Date: Wed, 15 Jul 2020 20:28:41 +0300
Subject: Finish up MPFR valgrind issues.

---
 gawkapi.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'gawkapi.c')

diff --git a/gawkapi.c b/gawkapi.c
index 8c3788e6..3dd4b4e3 100644
--- a/gawkapi.c
+++ b/gawkapi.c
@@ -25,14 +25,6 @@
 
 #include "awk.h"
 
-#ifdef HAVE_MPFR
-#define getmpfr(n)	getblock(n, BLOCK_MPFR, mpfr_ptr)
-#define freempfr(n)	freeblock(n, BLOCK_MPFR)
-
-#define getmpz(n)	getblock(n, BLOCK_MPZ, mpz_ptr)
-#define freempz(n)	freeblock(n, BLOCK_MPZ)
-#endif
-
 /* Declare some globals used by api_get_file: */
 extern IOBUF *curfile;
 extern INSTRUCTION *main_beginfile;
@@ -1310,7 +1302,7 @@ api_get_mpfr(awk_ext_id_t id)
 {
 #ifdef HAVE_MPFR
 	mpfr_ptr p;
-	getmpfr(p);
+	emalloc(p, mpfr_ptr, sizeof(mpfr_t), "api_get_mpfr");
 	mpfr_init(p);
 	return p;
 #else
@@ -1326,7 +1318,8 @@ api_get_mpz(awk_ext_id_t id)
 {
 #ifdef HAVE_MPFR
 	mpz_ptr p;
-	getmpz(p);
+	emalloc(p, mpz_ptr, sizeof (mpz_t), "api_get_mpz");
+
 	mpz_init(p);
 	return p;
 #else
-- 
cgit v1.2.3