diff options
| author | Michael Brown | 2007-06-11 22:36:22 +0200 |
|---|---|---|
| committer | Michael Brown | 2007-06-11 22:36:22 +0200 |
| commit | a74ecf3057726f18feaf48922be4421c941f8c25 (patch) | |
| tree | 17aeeb5d23d4e81d636366d4e1c9fbb2379eb484 /src/core | |
| parent | Updated TFTP and PXE UDP API code to use not-yet-implemented data-xfer (diff) | |
| parent | Renamed _calloc() to zalloc(), ready to be used as a standalone function. (diff) | |
| download | ipxe-a74ecf3057726f18feaf48922be4421c941f8c25.tar.gz ipxe-a74ecf3057726f18feaf48922be4421c941f8c25.tar.xz ipxe-a74ecf3057726f18feaf48922be4421c941f8c25.zip | |
Merge branch 'master' into mcb-tcp-xfer
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/malloc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/malloc.c b/src/core/malloc.c index 6dfdd632a..bf94592cc 100644 --- a/src/core/malloc.c +++ b/src/core/malloc.c @@ -311,8 +311,11 @@ void free ( void *ptr ) { * @ret ptr Allocated memory * * Allocate memory as per malloc(), and zero it. + * + * This function name is non-standard, but pretty intuitive. + * zalloc(size) is always equivalent to calloc(1,size) */ -void * _calloc ( size_t size ) { +void * zalloc ( size_t size ) { void *data; data = malloc ( size ); |