aboutsummaryrefslogtreecommitdiff
path: root/e2fsprogs/ext2fs/unix_io.c
diff options
context:
space:
mode:
authorlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-03-01 16:39:45 +0000
committerlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-03-01 16:39:45 +0000
commit5b5c0305447c61a4cc4a0c29a43c2dc2b1befe34 (patch)
treeebb8583e9e1265588592614c0b4878daded44125 /e2fsprogs/ext2fs/unix_io.c
parente04d15038c48aceb093d79fc8e69e5d88b670a24 (diff)
downloadbusybox-w32-5b5c0305447c61a4cc4a0c29a43c2dc2b1befe34.tar.gz
busybox-w32-5b5c0305447c61a4cc4a0c29a43c2dc2b1befe34.tar.bz2
busybox-w32-5b5c0305447c61a4cc4a0c29a43c2dc2b1befe34.zip
Cleanup patch from Denis Vlasenko. Mostly variants of removing the if(x)
from before "if(x) free(x)". git-svn-id: svn://busybox.net/trunk/busybox@14396 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'e2fsprogs/ext2fs/unix_io.c')
-rw-r--r--e2fsprogs/ext2fs/unix_io.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/e2fsprogs/ext2fs/unix_io.c b/e2fsprogs/ext2fs/unix_io.c
index 36b222577..7f57afddc 100644
--- a/e2fsprogs/ext2fs/unix_io.c
+++ b/e2fsprogs/ext2fs/unix_io.c
@@ -280,8 +280,7 @@ static void free_cache(struct unix_private_data *data)
280 cache->access_time = 0; 280 cache->access_time = 0;
281 cache->dirty = 0; 281 cache->dirty = 0;
282 cache->in_use = 0; 282 cache->in_use = 0;
283 if (cache->buf) 283 ext2fs_free_mem(&cache->buf);
284 ext2fs_free_mem(&cache->buf);
285 cache->buf = 0; 284 cache->buf = 0;
286 } 285 }
287} 286}
@@ -461,8 +460,7 @@ cleanup:
461 free_cache(data); 460 free_cache(data);
462 ext2fs_free_mem(&data); 461 ext2fs_free_mem(&data);
463 } 462 }
464 if (io) 463 ext2fs_free_mem(&io);
465 ext2fs_free_mem(&io);
466 return retval; 464 return retval;
467} 465}
468 466
@@ -487,8 +485,7 @@ static errcode_t unix_close(io_channel channel)
487 free_cache(data); 485 free_cache(data);
488 486
489 ext2fs_free_mem(&channel->private_data); 487 ext2fs_free_mem(&channel->private_data);
490 if (channel->name) 488 ext2fs_free_mem(&channel->name);
491 ext2fs_free_mem(&channel->name);
492 ext2fs_free_mem(&channel); 489 ext2fs_free_mem(&channel);
493 return retval; 490 return retval;
494} 491}