X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=mallocwrap.cc;h=689fb6a5f4c4781f17aa82d704ffd4538d41a7f9;hb=7ff2770de1315e88ea63e21dbaee9edda0e39827;hp=3ec0d3fb57d1314b7bf275b24747d3049b146f12;hpb=c40837f4351cd99154b3f244860c03f5b0afe2ff;p=model-checker.git diff --git a/mallocwrap.cc b/mallocwrap.cc index 3ec0d3f..689fb6a 100644 --- a/mallocwrap.cc +++ b/mallocwrap.cc @@ -11,39 +11,36 @@ static void * (*real_malloc)(size_t) = NULL; static void (*real_free)(void *ptr) = NULL; -static void __my_alloc_init(void) -{ - - real_malloc = (void *(*)(size_t))dlsym(RTLD_NEXT, "malloc"); - real_free = (void (*)(void *))dlsym(RTLD_NEXT, "free"); - if (real_malloc == NULL || real_free == NULL) { - fprintf(stderr, "Error in `dlsym`: %s\n", dlerror()); - return; - } +static void __my_alloc_init(void) { + real_malloc = (void *(*)(size_t))dlsym(RTLD_NEXT, "malloc"); + real_free = (void (*)(void *))dlsym(RTLD_NEXT, "free"); + if (real_malloc == NULL || real_free == NULL) { + fprintf(stderr, "Error in `dlsym`: %s\n", dlerror()); + return; + } } -void * myMalloc(size_t size) -{ - if (real_malloc == NULL) - __my_alloc_init(); +void * myMalloc(size_t size) { + if (real_malloc == NULL) + __my_alloc_init(); - return real_malloc(size); + return real_malloc(size); } void myFree(void *ptr) { - if (real_free == NULL) - __my_alloc_init(); + if (real_free == NULL) + __my_alloc_init(); - real_free(ptr); + real_free(ptr); } void * operator new(size_t size) throw(std::bad_alloc) { - return myMalloc(size); + return myMalloc(size); } void operator delete(void *p) throw() { - myFree(p); + myFree(p); }