misc: cppcheck cleanups

Fix a number of things that cppcheck complains about.  Most of these
are minor resource leaks and forgotten declarations.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index a5cd0073fb4014dc3d896838643d4c2bd9818969..a10446d038517a2b9ce587f2fd231ef4edf42a78 100644 (file)
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -666,7 +666,7 @@ static void dump_inline_data(FILE *out, const char *prefix, ext2_ino_t inode_num
 
        retval = ext2fs_inline_data_size(current_fs, inode_num, &size);
        if (!retval)
-               fprintf(out, "%sSize of inline data: %d", prefix, size);
+               fprintf(out, "%sSize of inline data: %zu", prefix, size);
 }
 
 void internal_dump_inode(FILE *out, const char *prefix,

diff --git a/debugfs/debugfs.h b/debugfs/debugfs.h
index 3c27f8254e0e722ade9873ac1956a7d6ba89fa95..0164ca5d41d16ef10e05a85accc47b163a28334b 100644 (file)
--- a/debugfs/debugfs.h
+++ b/debugfs/debugfs.h
@@ -177,6 +177,10 @@ extern time_t string_to_time(const char *arg);
 
 /* xattrs.c */
 void dump_inode_attributes(FILE *out, ext2_ino_t ino);
+void do_get_xattr(int argc, char **argv);
+void do_set_xattr(int argc, char **argv);
+void do_rm_xattr(int argc, char **argv);
+void do_list_xattr(int argc, char **argv);
 
 /* zap.c */
 extern void do_zap_block(int argc, char **argv);

diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index 641b3fb5ec4ffedce50c613242df60afdda06231..eb9497c953a004c3f6eee8f34298e5654a45aa3c 100644 (file)
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -446,7 +446,7 @@ static void check_is_really_dir(e2fsck_t ctx, struct problem_context *pctx,
        inlinedata_fs = (ctx->fs->super->s_feature_incompat &
                         EXT4_FEATURE_INCOMPAT_INLINE_DATA);
        if (inlinedata_fs && (inode->i_flags & EXT4_INLINE_DATA_FL)) {
-               unsigned int size;
+               size_t size;
 
                if (ext2fs_inline_data_size(ctx->fs, pctx->ino, &size))
                        return;

diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c
index 586f3a8c480b500fc5da75a8073da6877c5971cd..5488c73ee8328159aac1cf7d9073c696e3bd03a7 100644 (file)
--- a/e2fsck/pass2.c
+++ b/e2fsck/pass2.c
@@ -770,7 +770,7 @@ static int check_dir_block(ext2_filsys fs,
        int     dx_csum_size = 0, de_csum_size = 0;
        int     failed_csum = 0;
        int     is_leaf = 1;
-       int     inline_data_size = 0;
+       size_t  inline_data_size = 0;
        int     filetype = 0;
 
        cd = (struct check_dir_struct *) priv_data;

diff --git a/e2fsck/region.c b/e2fsck/region.c
index 4b669f08cf48f4e0159286bbddf9c7582a8abcc0..aaaaa19054cb943ddff98a8f83ca3edb13eef4b4 100644 (file)
--- a/e2fsck/region.c
+++ b/e2fsck/region.c
@@ -203,6 +203,8 @@ int main(int argc, char **argv)
                        break;
                }
        }
+       if (r)
+               region_free(r);
 }
 
 #endif /* TEST_PROGRAM */

diff --git a/lib/ext2fs/expanddir.c b/lib/ext2fs/expanddir.c
index 7cff343d13989660a17a32a6339bc31da073e637..d0f7287933510a83b956f1646787afe7517b5f45 100644 (file)
--- a/lib/ext2fs/expanddir.c
+++ b/lib/ext2fs/expanddir.c
@@ -18,6 +18,7 @@
 
 #include "ext2_fs.h"
 #include "ext2fs.h"
+#include "ext2fsP.h"
 
 struct expand_dir_struct {
        int             done;

diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index 3756e8b136ec5f74d79f797093b7ac0029ccc663..599c97231224565f28b970dfee5b5dc4d93a8e10 100644 (file)
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -1386,6 +1386,17 @@ errcode_t ext2fs_icount_validate(ext2_icount_t icount, FILE *);
 extern errcode_t ext2fs_get_memalign(unsigned long size,
                                     unsigned long align, void *ptr);
 
+/* inline_data.c */
+extern errcode_t ext2fs_inline_data_init(ext2_filsys fs, ext2_ino_t ino);
+extern errcode_t ext2fs_inline_data_size(ext2_filsys fs, ext2_ino_t ino,
+                                        size_t *size);
+extern errcode_t ext2fs_inline_data_get(ext2_filsys fs, ext2_ino_t ino,
+                                       struct ext2_inode *inode,
+                                       void *buf, size_t *size);
+extern errcode_t ext2fs_inline_data_set(ext2_filsys fs, ext2_ino_t ino,
+                                       struct ext2_inode *inode,
+                                       void *buf, size_t size);
+
 /* inode.c */
 extern errcode_t ext2fs_create_inode_cache(ext2_filsys fs,
                                           unsigned int cache_size);

diff --git a/lib/ext2fs/ext2fsP.h b/lib/ext2fs/ext2fsP.h
index 20257e2a073c03e1af09ff0f61ffc30b6d1d81ac..f8c61e6573539f7870c47c61795876d39c1f55f9 100644 (file)
--- a/lib/ext2fs/ext2fsP.h
+++ b/lib/ext2fs/ext2fsP.h
@@ -88,20 +88,11 @@ extern int ext2fs_process_dir_block(ext2_filsys     fs,
                                    int                 ref_offset,
                                    void                *priv_data);
 
-extern errcode_t ext2fs_inline_data_init(ext2_filsys fs, ext2_ino_t ino);
-extern errcode_t ext2fs_inline_data_size(ext2_filsys fs, ext2_ino_t ino,
-                                        size_t *size);
 extern errcode_t ext2fs_inline_data_ea_remove(ext2_filsys fs, ext2_ino_t ino);
 extern errcode_t ext2fs_inline_data_expand(ext2_filsys fs, ext2_ino_t ino);
 extern int ext2fs_inline_data_dir_iterate(ext2_filsys fs,
                                          ext2_ino_t ino,
                                          void *priv_data);
-extern errcode_t ext2fs_inline_data_get(ext2_filsys fs, ext2_ino_t ino,
-                                       struct ext2_inode *inode,
-                                       void *buf, size_t *size);
-extern errcode_t ext2fs_inline_data_set(ext2_filsys fs, ext2_ino_t ino,
-                                       struct ext2_inode *inode,
-                                       void *buf, size_t size);
 
 /* Generic numeric progress meter */
 

diff --git a/lib/ext2fs/mkdir.c b/lib/ext2fs/mkdir.c
index 06c2c7e7d3c79c45c46a0c65af0cf40042e8165d..c4c79679b6366ca6593ecb25346dfdf6398d86e5 100644 (file)
--- a/lib/ext2fs/mkdir.c
+++ b/lib/ext2fs/mkdir.c
@@ -26,6 +26,7 @@
 
 #include "ext2_fs.h"
 #include "ext2fs.h"
+#include "ext2fsP.h"
 
 #ifndef EXT2_FT_DIR
 #define EXT2_FT_DIR            2

diff --git a/lib/ext2fs/punch.c b/lib/ext2fs/punch.c
index 95e19d9113936783548d8d0b9e8ec5533fa4a62a..532c4b8780244b6772575eaa17084afe0b6472c3 100644 (file)
--- a/lib/ext2fs/punch.c
+++ b/lib/ext2fs/punch.c
@@ -19,6 +19,7 @@
 
 #include "ext2_fs.h"
 #include "ext2fs.h"
+#include "ext2fsP.h"
 
 #undef PUNCH_DEBUG
 

diff --git a/util/subst.c b/util/subst.c
index 6a5eab1bc72c4beef84abc76a4857f0fc972998f..2ea16d9ba3ca374d6a44923158b73f983f9601ee 100644 (file)
--- a/util/subst.c
+++ b/util/subst.c
@@ -426,6 +426,8 @@ int main(int argc, char **argv)
        }
        if (old)
                fclose(old);
+       if (newfn)
+               free(newfn);
        return (0);
 }