Skip to content

clean up unused xmalloc() #58

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
mknos wants to merge 3 commits into
base: master
Choose a base branch
from
Open

clean up unused xmalloc() #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd11c3b
remove xmalloc() alias for debug_xmalloc()
mknos Feb 18, 2025
ed4bf25
remove debug_xmalloc() declaration
mknos Feb 18, 2025
52110a5
remove unused debug_xmalloc()
mknos Feb 18, 2025
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
4 changes: 0 additions & 4 deletions src/dmalloc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

PMOD_EXPORT extern void *debug_xalloc(size_t);
PMOD_EXPORT extern void debug_xfree(void *);
PMOD_EXPORT extern void *debug_xmalloc(size_t);
PMOD_EXPORT extern void *debug_xcalloc(size_t,size_t);
PMOD_EXPORT extern void *debug_xrealloc(void *,size_t);
PMOD_EXPORT char *debug_xstrdup(const char *src);
Expand Down Expand Up @@ -140,7 +139,6 @@ const char *dmalloc_find_name(void *p);

#define xalloc(X) ((void *)debug_malloc_update_location((void *)debug_xalloc(X), DMALLOC_NAMED_LOCATION(" xalloc")))
#define xcalloc(N, S) ((void *)debug_malloc_update_location((void *)debug_xcalloc(N, S), DMALLOC_NAMED_LOCATION(" xcalloc")))
#define xmalloc(X) ((void *)debug_malloc_update_location((void *)debug_xmalloc(X), DMALLOC_NAMED_LOCATION(" xmalloc")))
#define xrealloc(N, S) ((void *)debug_malloc_update_location((void *)debug_xrealloc(N, S), DMALLOC_NAMED_LOCATION(" xrealloc")))
#define xstrdup(X) ((void *)debug_malloc_update_location((void *)debug_xstrdup(X), DMALLOC_NAMED_LOCATION(" xstrdup")))
#define xfree(X) debug_xfree(debug_malloc_update_location((X), DMALLOC_NAMED_LOCATION(" free")))
Expand Down Expand Up @@ -230,10 +228,8 @@ PMOD_EXPORT struct mallinfo dlmallinfo(void);
#define xstrdup debug_xstrdup

#if defined(DYNAMIC_MODULE) && defined(__NT__) && !defined(USE_DLL)
#define xmalloc debug_xmalloc
#define xfree debug_xfree
#else
#define xmalloc malloc
#define xfree free
#endif /* defined(DYNAMIC_MODULE) && defined(__NT__) && !defined(USE_DLL) */

Expand Down
5 changes: 0 additions & 5 deletions src/pike_memory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,11 +511,6 @@ PMOD_EXPORT void debug_xfree(void *mem)
free(mem);
}

PMOD_EXPORT void *debug_xmalloc(size_t s)
{
return malloc(s);
}

PMOD_EXPORT void *debug_xrealloc(void *m, size_t s)
{
void *ret = realloc(m,s);
Expand Down
1 change: 0 additions & 1 deletion src/pike_memory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ PMOD_EXPORT size_t hashmem(const void *, size_t len, size_t mlen) ATTRIBUTE((pur
#define MALLOC_FUNCTION ATTRIBUTE((malloc)) PIKE_WARN_UNUSED_RESULT_ATTRIBUTE

PMOD_EXPORT void *debug_xalloc(size_t size) MALLOC_FUNCTION;
PMOD_EXPORT void *debug_xmalloc(size_t s) MALLOC_FUNCTION;
PMOD_EXPORT void debug_xfree(void *mem);
PMOD_EXPORT void *debug_xrealloc(void *m, size_t s) MALLOC_FUNCTION;
PMOD_EXPORT void *debug_xcalloc(size_t n, size_t s) MALLOC_FUNCTION;
Expand Down