diff options
| author | Theodore Ts'o <tytso@mit.edu> | 1997-10-26 03:41:24 +0000 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 1997-10-26 03:41:24 +0000 |
| commit | 7b4e4534f9361b21d3fafdd88a58f133decee38c (patch) | |
| tree | db28490bbca280ffd8d74dcfa64ed7cba508cbbf /lib/ext2fs/dirblock.c | |
| parent | 78d8f90ffae45808096133c461ef1ee0e65de937 (diff) | |
| download | android_external_e2fsprogs-7b4e4534f9361b21d3fafdd88a58f133decee38c.tar.gz android_external_e2fsprogs-7b4e4534f9361b21d3fafdd88a58f133decee38c.tar.bz2 android_external_e2fsprogs-7b4e4534f9361b21d3fafdd88a58f133decee38c.zip | |
Many files:
Added definition of ext2fs_get_mem, ext2fs_free_mem, and
ext2fs_resize_mem in ext2fs.h, and changed all library routines to use
these wrapper functions.
Diffstat (limited to 'lib/ext2fs/dirblock.c')
| -rw-r--r-- | lib/ext2fs/dirblock.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/ext2fs/dirblock.c b/lib/ext2fs/dirblock.c index 6958bee7..0bb7cc55 100644 --- a/lib/ext2fs/dirblock.c +++ b/lib/ext2fs/dirblock.c @@ -56,9 +56,10 @@ errcode_t ext2fs_write_dir_block(ext2_filsys fs, blk_t block, if ((fs->flags & EXT2_FLAG_SWAP_BYTES) || (fs->flags & EXT2_FLAG_SWAP_BYTES_WRITE)) { - write_buf = buf = malloc(fs->blocksize); - if (!buf) - return EXT2_NO_MEMORY; + retval = ext2fs_get_mem(fs->blocksize, (void **) &buf); + if (retval) + return retval; + write_buf = buf; memcpy(buf, inbuf, fs->blocksize); p = buf; end = buf + fs->blocksize; @@ -73,7 +74,7 @@ errcode_t ext2fs_write_dir_block(ext2_filsys fs, blk_t block, write_buf = inbuf; retval = io_channel_write_blk(fs->io, block, 1, write_buf); if (buf) - free(buf); + ext2fs_free_mem((void **) &buf); return retval; } |