diff options
| author | Gui Hecheng <guihc.fnst@cn.fujitsu.com> | 2013-12-12 18:41:07 +0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-01-31 08:22:17 -0800 |
| commit | 3cae13ee934311b438ea15e773bc5c7d965d1cd8 (patch) | |
| tree | 35ac1175f20ba9a6b317e2f40d93ee639d389942 /btrfs-convert.c | |
| parent | e3c9596d3fc8b0df647a6cbae55c2d77570de759 (diff) | |
btrfs-progs: remove NULL-ptr judge before free for btrfs-progs
free(3) already checks the pointer for NULL, no need to do it
on your own. This patch make the change globally.
Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'btrfs-convert.c')
| -rw-r--r-- | btrfs-convert.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/btrfs-convert.c b/btrfs-convert.c index cb6ddd05..bf3defb4 100644 --- a/btrfs-convert.c +++ b/btrfs-convert.c @@ -547,8 +547,7 @@ static int create_file_extents(struct btrfs_trans_handle *trans, data.first_block, data.checksum); } fail: - if (buffer) - free(buffer); + free(buffer); return ret; error: fprintf(stderr, "ext2fs_block_iterate2: %s\n", error_message(err)); @@ -785,8 +784,7 @@ static int copy_single_xattr(struct btrfs_trans_handle *trans, ret = btrfs_insert_xattr_item(trans, root, namebuf, name_len, data, datalen, objectid); out: - if (databuf) - free(databuf); + free(databuf); return ret; } @@ -892,8 +890,7 @@ static int copy_extended_attrs(struct btrfs_trans_handle *trans, entry = EXT2_EXT_ATTR_NEXT(entry); } out: - if (buffer != NULL) - free(buffer); + free(buffer); if ((void *)ext2_inode != inode_buf) free(ext2_inode); return ret; |