From 544fa259287a2b919d8ed05bc201a5133032ef05 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Tue, 16 Jan 2007 08:36:42 +0000
Subject: 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).

---
 src/core/ebuffer.c | 6 +++---
 src/core/image.c   | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/core')

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
-- 
cgit v1.2.3-55-g7522