version.h:

  Update version.h for interim release
ChangeLog, Makefile.in, test_icount.c:
  Makefile.in (PROGS): Remove test_rel from the test programs that we
  	build for now.
  test_icount.c: Fix some random lint warnings.
Makefile.in:
  Fix typo in removing brel_ma.o and irel_ma.o from the Makefile

diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index eaba802..aeac210 100644 (file)
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -18,7 +18,6 @@ OBJS= ext2_err.o \
        block.o \
        bmap.o \
        bmove.o \
-#      brel_ma.o \
        check_desc.o \
        closefs.o \
        cmp_bitmaps.o \
@@ -36,7 +35,6 @@ OBJS= ext2_err.o \
        initialize.o \
        inline.o \
        inode.o \
-#      irel_ma.o \
        ismounted.o \
        link.o \
        llseek.o \

diff --git a/tests/progs/ChangeLog b/tests/progs/ChangeLog
index 52b8a78..5d36ecc 100644 (file)
--- a/tests/progs/ChangeLog
+++ b/tests/progs/ChangeLog
@@ -1,3 +1,10 @@
+Sat Oct 25 18:50:33 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in (PROGS): Remove test_rel from the test programs that
+               we build for now.
+
+       * test_icount.c: Fix some random lint warnings.
+
 Tue Jun 17 01:33:20 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * Release of E2fsprogs 1.11

diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in
index e740944..25a7428 100644 (file)
--- a/tests/progs/Makefile.in
+++ b/tests/progs/Makefile.in
@@ -13,7 +13,7 @@ INSTALL = @INSTALL@
 
 MK_CMDS=       ../../lib/ss/mk_cmds
 
-PROGS=         test_rel test_icount
+PROGS=         test_icount
 
 TEST_REL_OBJS= test_rel.o test_rel_cmds.o
 

diff --git a/tests/progs/test_icount.c b/tests/progs/test_icount.c
index 588e90f..5156cfa 100644 (file)
--- a/tests/progs/test_icount.c
+++ b/tests/progs/test_icount.c
@@ -222,8 +222,7 @@ void do_dump(int argc, char **argv)
 void do_validate(int argc, char **argv)
 {
        errcode_t       retval;
-       ino_t   size;
-       
+
        if (check_icount(argv[0]))
                return;
        retval = ext2fs_icount_validate(test_icount, stdout);
@@ -236,7 +235,6 @@ void do_validate(int argc, char **argv)
 
 void do_get_size(int argc, char **argv)
 {
-       errcode_t       retval;
        ino_t   size;
        
        if (check_icount(argv[0]))

diff --git a/version.h b/version.h
index e96ff84..ee18283 100644 (file)
--- a/version.h
+++ b/version.h
@@ -6,6 +6,6 @@
  * redistributed under the GNU Public License.
  */
 
-#define E2FSPROGS_VERSION "1.11-test"
-#define E2FSPROGS_DATE "16-Aug-97"
+#define E2FSPROGS_VERSION "1.11-WIP"
+#define E2FSPROGS_DATE "25-Oct-97"