Skip to content

walloc: fix size type from int => size_t #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lumpidu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

walloc: fix size type from int => size_t #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions include/EST_walloc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,15 @@
/*=======================================================================*/

#if !defined(__EST_WALLOC_H__)
#include <stddef.h>

#if defined(__cplusplus)
extern "C" {
#endif

void *safe_walloc(int size);
void *safe_wcalloc(int size);
void *safe_wrealloc(void *ptr, int size);
void *safe_walloc(size_t size);
void *safe_wcalloc(size_t size);
void *safe_wrealloc(void *ptr, size_t size);
#define walloc(TYPE,SIZE) ((TYPE *)safe_walloc(sizeof(TYPE)*(SIZE)))
#define wcalloc(TYPE,SIZE) ((TYPE *)safe_wcalloc(sizeof(TYPE)*(SIZE)))
#define wrealloc(PTR,TYPE,SIZE) ((TYPE *)safe_wrealloc((void *)(PTR), sizeof(TYPE)*(SIZE)))
Expand Down
12 changes: 6 additions & 6 deletions utils/walloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@
/* use the debug malloc in flite */
#include "cst_alloc.h"

void *safe_walloc(int size)
void *safe_walloc(size_t size)
{
return cst_safe_alloc(size);
}
void *safe_wrealloc(void *ptr, int size)
void *safe_wrealloc(void *ptr, size_t size)
{
return cst_safe_realloc(ptr,size);
}
void *safe_wcalloc(int size)
void *safe_wcalloc(size_t size)
{
return cst_safe_calloc(size);
}
Expand All @@ -81,7 +81,7 @@ void debug_memory_summary(void)
}

#else
void *safe_walloc(int size)
void *safe_walloc(size_t size)
{
char *p;

Expand All @@ -103,7 +103,7 @@ void *safe_walloc(int size)
return p;
}

void *safe_wrealloc(void *ptr, int size)
void *safe_wrealloc(void *ptr, size_t size)
{
char *p;

Expand All @@ -127,7 +127,7 @@ void *safe_wrealloc(void *ptr, int size)
return p;
}

void *safe_wcalloc(int size)
void *safe_wcalloc(size_t size)
{
char *p = safe_walloc(size);

Expand Down