From fdc2f1e3bdc2c015db794a123e5ea94669f28d25 Mon Sep 17 00:00:00 2001
From: Anton Kochkov <anton.kochkov@gmail.com>
Date: Wed, 1 Mar 2023 20:21:26 +0800
Subject: [PATCH] Move rz_mem_alloc() to rz_alloc.h (#3410)

---
 librz/include/rz_util/rz_alloc.h |  4 +++-
 librz/include/rz_util/rz_mem.h   |  2 --
 librz/util/alloc.c               | 10 +++++++++-
 librz/util/mem.c                 |  8 --------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/librz/include/rz_util/rz_alloc.h b/librz/include/rz_util/rz_alloc.h
index b7faa68b50..e9799e43b3 100644
--- a/librz/include/rz_util/rz_alloc.h
+++ b/librz/include/rz_util/rz_alloc.h
@@ -5,7 +5,9 @@
 #include <stdlib.h>
 #include <stddef.h>
 
-RZ_API void *rz_malloc_aligned(size_t size, size_t alignment);
+RZ_API RZ_OWN void *rz_mem_alloc(size_t sz);
+RZ_API void rz_mem_free(void *);
+RZ_API RZ_OWN void *rz_malloc_aligned(size_t size, size_t alignment);
 RZ_API void rz_free_aligned(void *p);
 
 #endif
diff --git a/librz/include/rz_util/rz_mem.h b/librz/include/rz_util/rz_mem.h
index 8dc26d5797..13f861b7b5 100644
--- a/librz/include/rz_util/rz_mem.h
+++ b/librz/include/rz_util/rz_mem.h
@@ -21,8 +21,6 @@ RZ_API ut64 rz_mem_get_num(const ut8 *b, int size);
 
 /* MEMORY POOL */
 RZ_API void *rz_mem_dup(const void *s, int l);
-RZ_API void *rz_mem_alloc(int sz);
-RZ_API void rz_mem_free(void *);
 RZ_API void rz_mem_memzero(void *, size_t);
 RZ_API void rz_mem_reverse(ut8 *b, int l);
 RZ_API int rz_mem_protect(void *ptr, int size, const char *prot);
diff --git a/librz/util/alloc.c b/librz/util/alloc.c
index 991d4fd85b..5095d60990 100644
--- a/librz/util/alloc.c
+++ b/librz/util/alloc.c
@@ -4,7 +4,7 @@
 #include <rz_util.h>
 #include <rz_util/rz_alloc.h>
 
-RZ_API void *rz_malloc_aligned(size_t size, size_t alignment) {
+RZ_API RZ_OWN void *rz_malloc_aligned(size_t size, size_t alignment) {
 #if HAVE_POSIX_MEMALIGN
 	void *result = NULL;
 	if (posix_memalign(&result, alignment, size) != 0) {
@@ -34,3 +34,11 @@ RZ_API void rz_free_aligned(void *p) {
 	free(((void **)p)[-1]);
 #endif
 }
+
+RZ_API RZ_OWN void *rz_mem_alloc(size_t sz) {
+	return calloc(sz, 1);
+}
+
+RZ_API void rz_mem_free(void *p) {
+	free(p);
+}
diff --git a/librz/util/mem.c b/librz/util/mem.c
index 79d140b70b..ea22a0507e 100644
--- a/librz/util/mem.c
+++ b/librz/util/mem.c
@@ -343,14 +343,6 @@ RZ_API bool rz_mem_is_zero(const ut8 *b, int l) {
 	return true;
 }
 
-RZ_API void *rz_mem_alloc(int sz) {
-	return calloc(sz, 1);
-}
-
-RZ_API void rz_mem_free(void *p) {
-	free(p);
-}
-
 RZ_API void rz_mem_memzero(void *dst, size_t l) {
 #ifdef _MSC_VER
 	RtlSecureZeroMemory(dst, l);