Remove trailing whitespace for the entire source tree

[tools/e2fsprogs.git] / lib / ext2fs / freefs.c

diff --git a/lib/ext2fs/freefs.c b/lib/ext2fs/freefs.c
index 8d1da19..2a1c915 100644 (file)
--- a/lib/ext2fs/freefs.c
+++ b/lib/ext2fs/freefs.c
@@ -1,6 +1,6 @@
 /*
  * freefs.c --- free an ext2 filesystem
- * 
+ *
  * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
  *
  * %Begin-Header%
@@ -13,10 +13,8 @@
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <stdlib.h>
-
-#include <linux/ext2_fs.h>
 
+#include "ext2_fs.h"
 #include "ext2fsP.h"
 
 static void ext2fs_free_inode_cache(struct ext2_inode_cache *icache);
@@ -25,22 +23,28 @@ void ext2fs_free(ext2_filsys fs)
 {
        if (!fs || (fs->magic != EXT2_ET_MAGIC_EXT2FS_FILSYS))
                return;
+       if (fs->image_io != fs->io) {
+               if (fs->image_io)
+                       io_channel_close(fs->image_io);
+       }
        if (fs->io) {
                io_channel_close(fs->io);
        }
        if (fs->device_name)
-               free(fs->device_name);
+               ext2fs_free_mem(&fs->device_name);
        if (fs->super)
-               free(fs->super);
+               ext2fs_free_mem(&fs->super);
+       if (fs->orig_super)
+               ext2fs_free_mem(&fs->orig_super);
        if (fs->group_desc)
-               free(fs->group_desc);
+               ext2fs_free_mem(&fs->group_desc);
        if (fs->block_map)
                ext2fs_free_block_bitmap(fs->block_map);
        if (fs->inode_map)
                ext2fs_free_inode_bitmap(fs->inode_map);
 
        if (fs->badblocks)
-               badblocks_list_free(fs->badblocks);
+               ext2fs_badblocks_list_free(fs->badblocks);
        fs->badblocks = 0;
 
        if (fs->dblist)
@@ -48,45 +52,10 @@ void ext2fs_free(ext2_filsys fs)
 
        if (fs->icache)
                ext2fs_free_inode_cache(fs->icache);
-       
-       fs->magic = 0;
-
-       free(fs);
-}
-
-void ext2fs_free_generic_bitmap(ext2fs_inode_bitmap bitmap)
-{
-       if (!bitmap || (bitmap->magic != EXT2_ET_MAGIC_GENERIC_BITMAP))
-               return;
 
-       bitmap->magic = 0;
-       if (bitmap->description) {
-               free(bitmap->description);
-               bitmap->description = 0;
-       }
-       if (bitmap->bitmap) {
-               free(bitmap->bitmap);
-               bitmap->bitmap = 0;
-       }
-       free(bitmap);
-}
-
-void ext2fs_free_inode_bitmap(ext2fs_inode_bitmap bitmap)
-{
-       if (!bitmap || (bitmap->magic != EXT2_ET_MAGIC_INODE_BITMAP))
-               return;
-
-       bitmap->magic = EXT2_ET_MAGIC_GENERIC_BITMAP;
-       ext2fs_free_generic_bitmap(bitmap);
-}
-
-void ext2fs_free_block_bitmap(ext2fs_block_bitmap bitmap)
-{
-       if (!bitmap || (bitmap->magic != EXT2_ET_MAGIC_BLOCK_BITMAP))
-               return;
+       fs->magic = 0;
 
-       bitmap->magic = EXT2_ET_MAGIC_GENERIC_BITMAP;
-       ext2fs_free_generic_bitmap(bitmap);
+       ext2fs_free_mem(&fs);
 }
 
 /*
@@ -97,27 +66,33 @@ static void ext2fs_free_inode_cache(struct ext2_inode_cache *icache)
        if (--icache->refcount)
                return;
        if (icache->buffer)
-               free(icache->buffer);
+               ext2fs_free_mem(&icache->buffer);
        if (icache->cache)
-               free(icache->cache);
+               ext2fs_free_mem(&icache->cache);
        icache->buffer_blk = 0;
-       free(icache);
+       ext2fs_free_mem(&icache);
 }
 
 /*
  * This procedure frees a badblocks list.
  */
-void ext2fs_badblocks_list_free(ext2_badblocks_list bb)
+void ext2fs_u32_list_free(ext2_u32_list bb)
 {
        if (bb->magic != EXT2_ET_MAGIC_BADBLOCKS_LIST)
                return;
 
        if (bb->list)
-               free(bb->list);
+               ext2fs_free_mem(&bb->list);
        bb->list = 0;
-       free(bb);
+       ext2fs_free_mem(&bb);
+}
+
+void ext2fs_badblocks_list_free(ext2_badblocks_list bb)
+{
+       ext2fs_u32_list_free((ext2_u32_list) bb);
 }
 
+
 /*
  * Free a directory block list
  */
@@ -127,11 +102,11 @@ void ext2fs_free_dblist(ext2_dblist dblist)
                return;
 
        if (dblist->list)
-               free(dblist->list);
+               ext2fs_free_mem(&dblist->list);
        dblist->list = 0;
        if (dblist->fs && dblist->fs->dblist == dblist)
                dblist->fs->dblist = 0;
        dblist->magic = 0;
-       free(dblist);
+       ext2fs_free_mem(&dblist);
 }