ChangeLog, dblist.c, ext2fs.h, jump.funcs:

  Added new function which returns the number of directory blocks in
  dblist.

diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index cfec76c..88d72a5 100644 (file)
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 16 23:53:06 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * dblist.c (ext2fs_dblist_count): Added new function which returns
+               the number of directory blocks in dblist.
+
 Sat Jun 14 01:39:13 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * unix_io.c (unix_flush): Make the io_channel flush function do a

diff --git a/lib/ext2fs/dblist.c b/lib/ext2fs/dblist.c
index 80e1f05..88763fc 100644 (file)
--- a/lib/ext2fs/dblist.c
+++ b/lib/ext2fs/dblist.c
@@ -179,7 +179,6 @@ errcode_t ext2fs_add_dir_block(ext2_dblist dblist, ino_t ino, blk_t blk,
 errcode_t ext2fs_set_dir_block(ext2_dblist dblist, ino_t ino, blk_t blk,
                               int blockcnt)
 {
-       struct ext2_db_entry    *ent;
        int                     i;
        
        EXT2_CHECK_MAGIC(dblist, EXT2_ET_MAGIC_DBLIST);
@@ -239,4 +238,7 @@ static int dir_block_cmp(const void *a, const void *b)
        return (db_a->blockcnt - db_b->blockcnt);
 }
 
-                            
+int ext2fs_dblist_count(ext2_dblist dblist)
+{
+       return (int) dblist->count;
+}

diff --git a/lib/ext2fs/dll/jump.funcs b/lib/ext2fs/dll/jump.funcs
index 680a64d..fb2a562 100644 (file)
--- a/lib/ext2fs/dll/jump.funcs
+++ b/lib/ext2fs/dll/jump.funcs
@@ -150,3 +150,4 @@
 00000000 T _ext2fs_icount_validate             libext2fs       icount
 00000000 T _ext2fs_resize_inode_bitmap                 libext2fs       rs_bitmap
 00000000 T _ext2fs_resize_block_bitmap                 libext2fs       rs_bitmap
+00000000 T _ext2fs_dblist_count                libext2fs       dblist

diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index 7305197..57dfacd 100644 (file)
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -496,6 +496,7 @@ extern errcode_t ext2fs_set_dir_block(ext2_dblist dblist, ino_t ino,
                                      blk_t blk, int blockcnt);
 extern errcode_t ext2fs_copy_dblist(ext2_dblist src,
                                    ext2_dblist *dest);
+extern int ext2fs_dblist_count(ext2_dblist dblist);
 
 /* dblist_dir.c */
 extern errcode_t