diff options
| author | Eric Andersen <andersen@codepoet.org> | 2000-07-19 17:35:54 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2000-07-19 17:35:54 +0000 |
| commit | ae6eae02dd85a196a4545376a50166aede8ce7c1 (patch) | |
| tree | c3dbc22408e4323f916fb1f1171f7aa73fa2aecc /modutils | |
| parent | 52d6fa3bb335fcfefc2b205e7ba509fc4b284793 (diff) | |
| download | busybox-w32-ae6eae02dd85a196a4545376a50166aede8ce7c1.tar.gz busybox-w32-ae6eae02dd85a196a4545376a50166aede8ce7c1.tar.bz2 busybox-w32-ae6eae02dd85a196a4545376a50166aede8ce7c1.zip | |
Moved some code and add a coupld #defines to support use of dmalloc.
-Erik
Diffstat (limited to 'modutils')
| -rw-r--r-- | modutils/insmod.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c index 9daedf938..cd75e2416 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c | |||
| @@ -70,7 +70,7 @@ | |||
| 70 | #ifndef MODUTILS_MODULE_H | 70 | #ifndef MODUTILS_MODULE_H |
| 71 | #define MODUTILS_MODULE_H 1 | 71 | #define MODUTILS_MODULE_H 1 |
| 72 | 72 | ||
| 73 | #ident "$Id: insmod.c,v 1.18 2000/07/16 20:57:15 kraai Exp $" | 73 | #ident "$Id: insmod.c,v 1.19 2000/07/19 17:35:54 andersen Exp $" |
| 74 | 74 | ||
| 75 | /* This file contains the structures used by the 2.0 and 2.1 kernels. | 75 | /* This file contains the structures used by the 2.0 and 2.1 kernels. |
| 76 | We do not use the kernel headers directly because we do not wish | 76 | We do not use the kernel headers directly because we do not wish |
| @@ -276,7 +276,7 @@ int delete_module(const char *); | |||
| 276 | #ifndef MODUTILS_OBJ_H | 276 | #ifndef MODUTILS_OBJ_H |
| 277 | #define MODUTILS_OBJ_H 1 | 277 | #define MODUTILS_OBJ_H 1 |
| 278 | 278 | ||
| 279 | #ident "$Id: insmod.c,v 1.18 2000/07/16 20:57:15 kraai Exp $" | 279 | #ident "$Id: insmod.c,v 1.19 2000/07/19 17:35:54 andersen Exp $" |
| 280 | 280 | ||
| 281 | /* The relocatable object is manipulated using elfin types. */ | 281 | /* The relocatable object is manipulated using elfin types. */ |
| 282 | 282 | ||
| @@ -563,16 +563,6 @@ static char m_fullName[BUFSIZ + 1] = "\0"; | |||
| 563 | 563 | ||
| 564 | /*======================================================================*/ | 564 | /*======================================================================*/ |
| 565 | 565 | ||
| 566 | void *xrealloc(void *old, size_t size) | ||
| 567 | { | ||
| 568 | void *ptr = realloc(old, size); | ||
| 569 | if (!ptr) { | ||
| 570 | perror("Out of memory"); | ||
| 571 | exit(1); | ||
| 572 | } | ||
| 573 | return ptr; | ||
| 574 | } | ||
| 575 | |||
| 576 | 566 | ||
| 577 | static int findNamedModule(const char *fileName, struct stat *statbuf, | 567 | static int findNamedModule(const char *fileName, struct stat *statbuf, |
| 578 | void *userDate) | 568 | void *userDate) |
