diff options
| author | Michael Brown | 2007-01-16 09:36:42 +0100 |
|---|---|---|
| committer | Michael Brown | 2007-01-16 09:36:42 +0100 |
| commit | 544fa259287a2b919d8ed05bc201a5133032ef05 (patch) | |
| tree | ff78f4abbfb22c10f45402f98c11e2d5419f5e70 /src/core | |
| parent | Create and use async_block() macro; it cuts down on the visual overhead (diff) | |
| download | ipxe-544fa259287a2b919d8ed05bc201a5133032ef05.tar.gz ipxe-544fa259287a2b919d8ed05bc201a5133032ef05.tar.xz ipxe-544fa259287a2b919d8ed05bc201a5133032ef05.zip | |
Rename e{malloc,realloc,free} to u{malloc,realloc,free}, to more obviously
reflect the fact that they allocate and deallocate user memory (i.e.
things reached through a userptr_t).
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ebuffer.c | 6 | ||||
| -rw-r--r-- | src/core/image.c | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/core/ebuffer.c b/src/core/ebuffer.c index 5abfca745..16d49a12e 100644 --- a/src/core/ebuffer.c +++ b/src/core/ebuffer.c @@ -25,7 +25,7 @@ #include <errno.h> #include <gpxe/buffer.h> -#include <gpxe/emalloc.h> +#include <gpxe/umalloc.h> #include <gpxe/ebuffer.h> /** @@ -46,7 +46,7 @@ static int ebuffer_expand ( struct buffer *buffer, size_t new_len ) { actual_len <<= 1; /* Reallocate buffer */ - new_addr = erealloc ( buffer->addr, actual_len ); + new_addr = urealloc ( buffer->addr, actual_len ); if ( ! new_addr ) return -ENOMEM; @@ -63,7 +63,7 @@ static int ebuffer_expand ( struct buffer *buffer, size_t new_len ) { * @ret rc Return status code * * Allocates space for the buffer and stores it in @c buffer->addr. - * The space must eventually be freed by calling efree(buffer->addr). + * The space must eventually be freed by calling ufree(buffer->addr). */ int ebuffer_alloc ( struct buffer *buffer, size_t len ) { memset ( buffer, 0, sizeof ( *buffer ) ); diff --git a/src/core/image.c b/src/core/image.c index e0e842c0e..0ff0a7065 100644 --- a/src/core/image.c +++ b/src/core/image.c @@ -23,7 +23,6 @@ #include <assert.h> #include <vsprintf.h> #include <gpxe/list.h> -#include <gpxe/emalloc.h> #include <gpxe/image.h> /** @file |