portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move rz_mem_alloc() to rz_alloc.h (#3410)

Browse source
This commit is contained in:
Anton Kochkov 2023-03-01 20:21:26 +08:00 committed by GitHub
parent 50d17471e7
commit fdc2f1e3bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
librz/include/rz_util/rz_alloc.h
View file

@ -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

2
librz/include/rz_util/rz_mem.h
View file

@ -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);

10
librz/util/alloc.c
View file

@ -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);
}

8
librz/util/mem.c
View file

@ -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);