Chameleon Commit Details - 22 - Chameleon open source boot loader project.

Date:

2010-01-17 16:58:15 (14 years 3 months ago)

Author:

JrCs

Commit:

Parents:

Message:

New malloc macro that use safe_malloc with 3 parameters

Changes:

M	/branches/JrCs/i386/libsa/libsa.h
M	/branches/JrCs/i386/libsa/zalloc.c

File differences

-91
92 92
93 93
94
94 95
95 
96
96 97
97 98
98 99
+/*␊
 * zalloc.c␊
 */␊
#define malloc(size)␉safe_malloc(size, __FILE__, __LINE__)␊
extern void   malloc_init(char * start, int size, int nodes, void (*malloc_error)(char *, size_t));␊
extern void * malloc(size_t size);␊
extern void * safe_malloc(size_t size,const char *file, int line);␊
extern void   free(void * start);␊
extern void * realloc(void * ptr, size_t size);␊
␊
 /*␊
  * zalloc.c␊
  */␊
+#define malloc(size)␉safe_malloc(size, __FILE__, __LINE__)␊
 extern void   malloc_init(char * start, int size, int nodes, void (*malloc_error)(char *, size_t));␊
-extern void * malloc(size_t size);␊
+extern void * safe_malloc(size_t size,const char *file, int line);␊
 extern void   free(void * start);␊
 extern void * realloc(void * ptr, size_t size);␊
 ␊

-86
87 87
88 88
89 
89
90 90
91 91
92 92
... ...
315 315
316 316
317 317
318 
318
319 319
320 320
321 321
+␊
#define BEST_FIT 1␊
␊
void * malloc(size_t size)␊
void * safe_malloc(size_t size, const char *file, int line)␊
{␊
␉int    i;␊
#if BEST_FIT␊

/* This is the simplest way possible.  Should fix this. */␊
void * realloc(void * start, size_t newsize)␊
{␊
    void * newstart = malloc(newsize);␊
    void * newstart = safe_malloc(newsize, __FILE__, __LINE__);␊
    bcopy(start, newstart, newsize);␊
    free(start);␊
    return newstart;␊
 ...
 ␊
 #define BEST_FIT 1␊
 ␊
-void * malloc(size_t size)␊
+void * safe_malloc(size_t size, const char *file, int line)␊
 {␊
 ␉int    i;␊
 #if BEST_FIT␊
 /* This is the simplest way possible.  Should fix this. */␊
 void * realloc(void * start, size_t newsize)␊
 {␊
-    void * newstart = malloc(newsize);␊
+    void * newstart = safe_malloc(newsize, __FILE__, __LINE__);␊
     bcopy(start, newstart, newsize);␊
     free(start);␊
     return newstart;␊