mirror of
https://github.com/ipxe/ipxe
synced 2025-12-15 00:12:19 +03:00
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).
This commit is contained in:
@@ -25,7 +25,7 @@
|
||||
|
||||
#include <errno.h>
|
||||
#include <vsprintf.h>
|
||||
#include <gpxe/emalloc.h>
|
||||
#include <gpxe/umalloc.h>
|
||||
#include <gpxe/ebuffer.h>
|
||||
#include <gpxe/image.h>
|
||||
#include <gpxe/uri.h>
|
||||
@@ -45,9 +45,9 @@
|
||||
* @ret len Length of loaded file
|
||||
* @ret rc Return status code
|
||||
*
|
||||
* Fetch file to an external buffer allocated with emalloc(). The
|
||||
* Fetch file to an external buffer allocated with umalloc(). The
|
||||
* caller is responsible for eventually freeing the buffer with
|
||||
* efree().
|
||||
* ufree().
|
||||
*/
|
||||
int fetch ( const char *uri_string, userptr_t *data, size_t *len ) {
|
||||
struct uri *uri;
|
||||
@@ -101,7 +101,7 @@ int fetch ( const char *uri_string, userptr_t *data, size_t *len ) {
|
||||
return 0;
|
||||
|
||||
err:
|
||||
efree ( buffer.addr );
|
||||
ufree ( buffer.addr );
|
||||
err_ebuffer_alloc:
|
||||
free_uri ( uri );
|
||||
err_parse_uri:
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#include <errno.h>
|
||||
#include <vsprintf.h>
|
||||
#include <gpxe/image.h>
|
||||
#include <gpxe/emalloc.h>
|
||||
#include <gpxe/umalloc.h>
|
||||
#include <usr/fetch.h>
|
||||
#include <usr/imgmgmt.h>
|
||||
|
||||
@@ -66,7 +66,7 @@ int imgfetch ( const char *filename, const char *name,
|
||||
return 0;
|
||||
|
||||
err:
|
||||
efree ( image->data );
|
||||
ufree ( image->data );
|
||||
free ( image );
|
||||
return rc;
|
||||
}
|
||||
@@ -139,6 +139,6 @@ void imgstat ( struct image *image ) {
|
||||
*/
|
||||
void imgfree ( struct image *image ) {
|
||||
unregister_image ( image );
|
||||
efree ( image->data );
|
||||
ufree ( image->data );
|
||||
free ( image );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user