diff options
| author | Charles Manning <cdhmanning@gmail.com> | 2010-12-23 10:46:38 +1300 |
|---|---|---|
| committer | Charles Manning <cdhmanning@gmail.com> | 2010-12-23 10:46:38 +1300 |
| commit | 3c25b14489d1ef9c4ba073dacd9a9f8bb218fe32 (patch) | |
| tree | 367359bfcd6e7155343757b0e2ab48807f56a679 /direct | |
| parent | 2870702e0b0f4342857222a36ffcb21886c7f4bf (diff) | |
yaffs direct: Change yaffs_malloc to yaffsfs_malloc etc
Keep names consistent.
Signed-off-by: Charles Manning <cdhmanning@gmail.com>
Diffstat (limited to 'direct')
| -rw-r--r-- | direct/basic-test/yaffs_osglue.c | 4 | ||||
| -rw-r--r-- | direct/yaffs_osglue.h | 4 | ||||
| -rw-r--r-- | direct/ydirectenv.h | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/direct/basic-test/yaffs_osglue.c b/direct/basic-test/yaffs_osglue.c index 6e8870b..7eaafc9 100644 --- a/direct/basic-test/yaffs_osglue.c +++ b/direct/basic-test/yaffs_osglue.c @@ -83,7 +83,7 @@ static int yaffs_kill_alloc = 0; static size_t total_malloced = 0; static size_t malloc_limit = 0 & 6000000; -void *yaffs_malloc(size_t size) +void *yaffsfs_malloc(size_t size) { void * this; if(yaffs_kill_alloc) @@ -97,7 +97,7 @@ void *yaffs_malloc(size_t size) return this; } -void yaffs_free(void *ptr) +void yaffsfs_free(void *ptr) { free(ptr); } diff --git a/direct/yaffs_osglue.h b/direct/yaffs_osglue.h index ab05fd4..ec92f9d 100644 --- a/direct/yaffs_osglue.h +++ b/direct/yaffs_osglue.h @@ -32,8 +32,8 @@ u32 yaffsfs_CurrentTime(void); void yaffsfs_SetError(int err); -void *yaffs_malloc(size_t size); -void yaffs_free(void *ptr); +void *yaffsfs_malloc(size_t size); +void yaffsfs_free(void *ptr); void yaffsfs_OSInitialisation(void); diff --git a/direct/ydirectenv.h b/direct/ydirectenv.h index 63cd6d8..3c6ddf5 100644 --- a/direct/ydirectenv.h +++ b/direct/ydirectenv.h @@ -53,10 +53,10 @@ void yaffs_qsort(void *aa, size_t n, size_t es, #define inline __inline__ #endif -#define kmalloc(x,flags) yaffs_malloc(x) -#define kfree(x) yaffs_free(x) -#define vmalloc(x) yaffs_malloc(x) -#define vfree(x) yaffs_free(x) +#define kmalloc(x,flags) yaffsfs_malloc(x) +#define kfree(x) yaffsfs_free(x) +#define vmalloc(x) yaffsfs_malloc(x) +#define vfree(x) yaffsfs_free(x) #define cond_resched() do {} while(0) |