use xmalloc instead of malloc

3 files changed, 10 insertions, 34 deletions

diff --git a/e2fsprogs/ext2fs/finddev.c b/e2fsprogs/ext2fs/finddev.c
index fa2cadde4..c459c0833 100644
--- a/e2fsprogs/ext2fs/finddev.c
+++ b/e2fsprogs/ext2fs/finddev.c
@@ -46,14 +46,8 @@ static void add_to_dirlist(const char *name, struct dir_list **list)
 {
         struct dir_list *dp;
 
-        dp = malloc(sizeof(struct dir_list));
-        if (!dp)
-                return;
-        dp->name = malloc(strlen(name)+1);
-        if (!dp->name) {
-                free(dp);
-                return;
-        }
+        dp = xmalloc(sizeof(struct dir_list));
+        dp->name = xmalloc(strlen(name)+1);
         strcpy(dp->name, name);
         dp->next = *list;
         *list = dp;
@@ -100,11 +94,7 @@ static int scan_dir(char *dir_name, dev_t device, struct dir_list **list,
                 if (S_ISDIR(st.st_mode))
                         add_to_dirlist(path, list);
                 if (S_ISBLK(st.st_mode) && st.st_rdev == device) {
-                        cp = malloc(strlen(path)+1);
-                        if (!cp) {
-                                closedir(dir);
-                                return ENOMEM;
-                        }
+                        cp = xmalloc(strlen(path)+1);
                         strcpy(cp, path);
                         *ret_path = cp;
                         goto success;
diff --git a/e2fsprogs/ext2fs/imager.c b/e2fsprogs/ext2fs/imager.c
index 596fbbebe..3f2826b82 100644
--- a/e2fsprogs/ext2fs/imager.c
+++ b/e2fsprogs/ext2fs/imager.c
@@ -66,9 +66,7 @@ errcode_t ext2fs_image_inode_write(ext2_filsys fs, int fd, int flags)
         ssize_t         actual;
         errcode_t       retval;
 
-        buf = malloc(fs->blocksize * BUF_BLOCKS);
-        if (!buf)
-                return ENOMEM;
+        buf = xmalloc(fs->blocksize * BUF_BLOCKS);
         
         for (group = 0; group < fs->group_desc_count; group++) {
                 blk = fs->group_desc[(unsigned)group].bg_inode_table;
@@ -138,9 +136,7 @@ errcode_t ext2fs_image_inode_read(ext2_filsys fs, int fd,
         ssize_t         actual;
         errcode_t       retval;
 
-        buf = malloc(fs->blocksize * BUF_BLOCKS);
-        if (!buf)
-                return ENOMEM;
+        buf = xmalloc(fs->blocksize * BUF_BLOCKS);
         
         for (group = 0; group < fs->group_desc_count; group++) {
                 blk = fs->group_desc[(unsigned)group].bg_inode_table;
@@ -187,9 +183,7 @@ errcode_t ext2fs_image_super_write(ext2_filsys fs, int fd,
         ssize_t         actual;
         errcode_t       retval;
 
-        buf = malloc(fs->blocksize);
-        if (!buf)
-                return ENOMEM;
+        buf = xmalloc(fs->blocksize);
 
         /*
          * Write out the superblock
@@ -238,9 +232,7 @@ errcode_t ext2fs_image_super_read(ext2_filsys fs, int fd,
         errcode_t       retval;
 
         size = fs->blocksize * (fs->group_desc_count + 1);
-        buf = malloc(size);
-        if (!buf)
-                return ENOMEM;
+        buf = xmalloc(size);
 
         /*
          * Read it all in.
@@ -364,9 +356,7 @@ errcode_t ext2fs_image_bitmap_read(ext2_filsys fs, int fd, int flags)
         }
         size = size * fs->group_desc_count;
 
-        buf = malloc(size);
-        if (!buf)
-                return ENOMEM;
+        buf = xmalloc(size);
 
         actual = read(fd, buf, size);
         if (actual == -1) {
diff --git a/e2fsprogs/ext2fs/inode.c b/e2fsprogs/ext2fs/inode.c
index 222568ebe..30580bf6d 100644
--- a/e2fsprogs/ext2fs/inode.c
+++ b/e2fsprogs/ext2fs/inode.c
@@ -641,9 +641,7 @@ errcode_t ext2fs_write_inode_full(ext2_filsys fs, ext2_ino_t ino,
                 length = EXT2_INODE_SIZE(fs->super);
 
         if (length > (int) sizeof(struct ext2_inode_large)) {
-                w_inode = malloc(length);
-                if (!w_inode)
-                        return ENOMEM;
+                w_inode = xmalloc(length);
         } else
                 w_inode = &temp_inode;
         memset(w_inode, 0, length);
@@ -731,9 +729,7 @@ errcode_t ext2fs_write_new_inode(ext2_filsys fs, ext2_ino_t ino,
                 return ext2fs_write_inode_full(fs, ino, inode,
                                                sizeof(struct ext2_inode));
 
-        buf = malloc(size);
-        if (!buf)
-                return ENOMEM;
+        buf = xmalloc(size);
 
         memset(buf, 0, size);
         *buf = *inode;