ChangeLog, mkjournal.c:

  mkjournal.c (ext2fs_add_journal_device): Fix various gcc -Wall
  	complaints including a missing return 0 at the end of
  	ext2fs_add_journal_device.
ChangeLog, ext2fs.h:
  ext2fs.h: Indent the #warning to fix gcc -Wall complaint.

diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index 97b9822..7675edb 100644 (file)
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-05    <tytso@snap.thunk.org>
+
+       * ext2fs.h: Indent the #warning to fix gcc -Wall complaint.
+
+       * mkjournal.c (ext2fs_add_journal_device): Fix various gcc -Wall
+               complaints including a missing return 0 at the end of
+               ext2fs_add_journal_device.
+
 2001-01-03    <tytso@snap.thunk.org>
 
        * Makefile.in: Link in libe2p when creating libext2fs as a shared

diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index c4b53d7..1f3e614 100644 (file)
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -407,7 +407,7 @@ typedef struct ext2_icount *ext2_icount_t;
 /* If the below warning bugs you, then have
    `CPPFLAGS=-DI_KNOW_THAT_COMPRESSION_IS_EXPERIMENTAL' in your
    environment at configure time. */
-#warning "Compression support is experimental"
+ #warning "Compression support is experimental"
 #endif
 #define EXT2_LIB_FEATURE_INCOMPAT_SUPP (EXT2_FEATURE_INCOMPAT_FILETYPE|\
                                         EXT2_FEATURE_INCOMPAT_COMPRESSION|\

diff --git a/lib/ext2fs/mkjournal.c b/lib/ext2fs/mkjournal.c
index cea01c5..9bb0f66 100644 (file)
--- a/lib/ext2fs/mkjournal.c
+++ b/lib/ext2fs/mkjournal.c
@@ -35,6 +35,7 @@
 #include <linux/ext2_fs.h>
 #endif
 
+#include "e2p/e2p.h"
 #include "ext2fs.h"
 #include "jfs_user.h"
 
@@ -130,7 +131,6 @@ static int mkjournal_proc(ext2_filsys               fs,
        struct mkjournal_struct *es = (struct mkjournal_struct *) priv_data;
        blk_t   new_blk;
        static blk_t    last_blk = 0;
-       char            *block;
        errcode_t       retval;
        int             group;
        
@@ -264,6 +264,7 @@ errcode_t ext2fs_add_journal_device(ext2_filsys fs, char *device,
               sizeof(fs->super->s_journal_uuid));
        fs->super->s_feature_compat |= EXT3_FEATURE_COMPAT_HAS_JOURNAL;
        ext2fs_mark_super_dirty(fs);
+       return 0;
 }
 
 /*
@@ -279,8 +280,8 @@ errcode_t ext2fs_add_journal_inode(ext2_filsys fs, blk_t size, int flags)
        char                    jfile[1024];
        int                     fd, mount_flags;
 
-       if (retval = ext2fs_check_mount_point(fs->device_name, &mount_flags,
-                                             jfile, sizeof(jfile)-10))
+       if ((retval = ext2fs_check_mount_point(fs->device_name, &mount_flags,
+                                              jfile, sizeof(jfile)-10)))
                return retval;
 
        if (mount_flags & EXT2_MF_MOUNTED) {