Moved some code and add a coupld #defines to support use of dmalloc.

-Erik
This commit is contained in:
Eric Andersen
2000-07-19 17:35:54 +00:00
parent 52d6fa3bb3
commit ae6eae02dd
4 changed files with 26 additions and 27 deletions

View File

@@ -1454,17 +1454,28 @@ extern pid_t* findPidByName( char* pidName)
#endif /* BB_FEATURE_USE_DEVPS_PATCH */
#endif /* BB_KILLALL || ( BB_FEATURE_LINUXRC && ( BB_HALT || BB_REBOOT || BB_POWEROFF )) */
#ifndef DMALLOC
/* this should really be farmed out to libbusybox.a */
extern void *xmalloc(size_t size)
{
void *cp = malloc(size);
void *ptr = malloc(size);
if (cp == NULL)
if (!ptr)
fatalError(memory_exhausted);
return cp;
return ptr;
}
void *xrealloc(void *old, size_t size)
{
void *ptr = realloc(old, size);
if (!ptr)
fatalError(memory_exhausted);
return ptr;
}
#endif
#if defined BB_FEATURE_NFSMOUNT
# ifndef DMALLOC
extern char * xstrdup (const char *s) {
char *t;
@@ -1478,6 +1489,7 @@ extern char * xstrdup (const char *s) {
return t;
}
# endif
extern char * xstrndup (const char *s, int n) {
char *t;