diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-07-24 16:13:10 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-07-24 16:13:18 -0400 |
| commit | 62b5690415786c4a6e8bac464aa8db578beb74f5 (patch) | |
| tree | d757927ea06357ae8b7be3594883960a4c3b908b | |
| parent | 036822584b26854e2f486f1bea84d8d19d9324de (diff) | |
Remove some more MEMBUG garbage.
| -rw-r--r-- | include/os.h | 2 | ||||
| -rw-r--r-- | os/osinit.c | 1 | ||||
| -rw-r--r-- | os/utils.c | 42 |
3 files changed, 0 insertions, 45 deletions
diff --git a/include/os.h b/include/os.h index 0a23a731a..7c8477209 100644 --- a/include/os.h +++ b/include/os.h @@ -230,8 +230,6 @@ extern pointer XNFalloc(unsigned long /*amount*/); extern pointer XNFcalloc(unsigned long /*amount*/); extern pointer XNFrealloc(pointer /*ptr*/, unsigned long /*amount*/); -extern void OsInitAllocator(void); - extern char *Xstrdup(const char *s); extern char *XNFstrdup(const char *s); extern char *Xprintf(const char *fmt, ...); diff --git a/os/osinit.c b/os/osinit.c index 93e1d039f..986a6420c 100644 --- a/os/osinit.c +++ b/os/osinit.c @@ -204,7 +204,6 @@ OsInit(void) if (!SmartScheduleInit ()) SmartScheduleDisable = TRUE; #endif - OsInitAllocator(); } void diff --git a/os/utils.c b/os/utils.c index 19b7a7dcf..0682bef82 100644 --- a/os/utils.c +++ b/os/utils.c @@ -224,12 +224,6 @@ _X_EXPORT Bool Must_have_memory = FALSE; #define HAS_SAVED_IDS_AND_SETEUID #endif -#ifdef MEMBUG -#define MEM_FAIL_SCALE 100000 -long Memory_fail = 0; -#include <stdlib.h> /* for random() */ -#endif - static char *dev_tty_from_init = NULL; /* since we need to parse it anyway */ OsSigHandlerPtr @@ -496,9 +490,6 @@ void UseMsg(void) ErrorF("use: X [:<display>] [option]\n"); ErrorF("-a # mouse acceleration (pixels)\n"); ErrorF("-ac disable access control restrictions\n"); -#ifdef MEMBUG - ErrorF("-alloc int chance alloc should fail\n"); -#endif ErrorF("-audit int set audit trail level\n"); ErrorF("-auth file select authorization file\n"); ErrorF("-br create root window with black background\n"); @@ -644,15 +635,6 @@ ProcessCommandLine(int argc, char *argv[]) { defeatAccessControl = TRUE; } -#ifdef MEMBUG - else if ( strcmp( argv[i], "-alloc") == 0) - { - if(++i < argc) - Memory_fail = atoi(argv[i]); - else - UseMsg(); - } -#endif else if ( strcmp( argv[i], "-audit") == 0) { if(++i < argc) @@ -1108,11 +1090,6 @@ Xalloc(unsigned long amount) } /* aligned extra on long word boundary */ amount = (amount + (sizeof(long) - 1)) & ~(sizeof(long) - 1); -#ifdef MEMBUG - if (!Must_have_memory && Memory_fail && - ((random() % MEM_FAIL_SCALE) < Memory_fail)) - return (unsigned long *)NULL; -#endif if ((ptr = (pointer)malloc(amount))) { return (unsigned long *)ptr; } @@ -1184,11 +1161,6 @@ XNFcalloc(unsigned long amount) _X_EXPORT void * Xrealloc(pointer ptr, unsigned long amount) { -#ifdef MEMBUG - if (!Must_have_memory && Memory_fail && - ((random() % MEM_FAIL_SCALE) < Memory_fail)) - return (unsigned long *)NULL; -#endif if ((long)amount <= 0) { if (ptr && !amount) @@ -1234,20 +1206,6 @@ Xfree(pointer ptr) if (ptr) free((char *)ptr); } - -void -OsInitAllocator (void) -{ -#ifdef MEMBUG - static int been_here; - - /* Check the memory system after each generation */ - if (been_here) - CheckMemory (); - else - been_here = 1; -#endif -} #endif /* !INTERNAL_MALLOC */ |