Fix gcc -Wall warnings

[thirdparty/e2fsprogs.git] / debugfs / debugfs.c

diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index c19f2a914c794f6082e4873a4b1d0750afc28b3d..190c4b7b26fef7e94392b49496d8cd2f5052ea70 100644 (file)
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -378,10 +378,12 @@ static void finish_range(struct list_blocks_struct *lb)
        else
                fprintf(lb->f, ", ");
        if (lb->first_block == lb->last_block)
-               fprintf(lb->f, "(%lld):%u", lb->first_bcnt, lb->first_block);
+               fprintf(lb->f, "(%lld):%u",
+                       (long long)lb->first_bcnt, lb->first_block);
        else
-               fprintf(lb->f, "(%lld-%lld):%u-%u", lb->first_bcnt,
-                       lb->last_bcnt, lb->first_block, lb->last_block);
+               fprintf(lb->f, "(%lld-%lld):%u-%u",
+                       (long long)lb->first_bcnt, (long long)lb->last_bcnt,
+                       lb->first_block, lb->last_block);
        lb->first_block = 0;
 }
 
@@ -449,8 +451,9 @@ static void dump_xattr_string(FILE *out, const char *str, int len)
                        fprintf(out, "%02x ", (unsigned char)str[i]);
 }
 
-static void internal_dump_inode_extra(FILE *out, const char *prefix,
-                                     ext2_ino_t inode_num, 
+static void internal_dump_inode_extra(FILE *out, 
+                                     const char *prefix EXT2FS_ATTR((unused)),
+                                     ext2_ino_t inode_num EXT2FS_ATTR((unused)), 
                                      struct ext2_inode_large *inode)
 {
        struct ext2_ext_attr_entry *entry;
@@ -508,7 +511,7 @@ static void dump_blocks(FILE *f, const char *prefix, ext2_ino_t inode)
                             list_blocks_proc, (void *)&lb);
        finish_range(&lb);
        if (lb.total)
-               fprintf(f, "\n%sTOTAL: %lld\n", prefix, lb.total);
+               fprintf(f, "\n%sTOTAL: %lld\n", prefix, (long long)lb.total);
        fprintf(f,"\n");
 }
 
@@ -534,12 +537,12 @@ void internal_dump_inode(FILE *out, const char *prefix,
                prefix, 
                inode->i_mode & 0777, inode->i_flags, inode->i_generation);
        fprintf(out, "%sUser: %5d   Group: %5d   Size: ",
-               prefix, inode->i_uid, inode->i_gid);
+               prefix, inode_uid(*inode), inode_gid(*inode));
        if (LINUX_S_ISREG(inode->i_mode)) {
-               __u64 i_size = (inode->i_size |
-                               ((unsigned long long)inode->i_size_high << 32));
+               unsigned long long i_size = (inode->i_size |
+                                   ((unsigned long long)inode->i_size_high << 32));
 
-               fprintf(out, "%lld\n", i_size);
+               fprintf(out, "%llu\n", i_size);
        } else
                fprintf(out, "%d\n", inode->i_size);
        if (os == EXT2_OS_HURD)
@@ -1008,7 +1011,7 @@ static void make_link(char *sourcename, char *destname)
        struct ext2_inode inode;
        int             retval;
        ext2_ino_t      dir;
-       char            *dest, *cp, *basename;
+       char            *dest, *cp, *base_name;
 
        /*
         * Get the source inode
@@ -1016,17 +1019,17 @@ static void make_link(char *sourcename, char *destname)
        ino = string_to_inode(sourcename);
        if (!ino)
                return;
-       basename = strrchr(sourcename, '/');
-       if (basename)
-               basename++;
+       base_name = strrchr(sourcename, '/');
+       if (base_name)
+               base_name++;
        else
-               basename = sourcename;
+               base_name = sourcename;
        /*
         * Figure out the destination.  First see if it exists and is
         * a directory.  
         */
        if (! (retval=ext2fs_namei(current_fs, root, cwd, destname, &dir)))
-               dest = basename;
+               dest = base_name;
        else {
                /*
                 * OK, it doesn't exist.  See if it is
@@ -1120,19 +1123,19 @@ static void unlink_file_by_name(char *filename)
 {
        int             retval;
        ext2_ino_t      dir;
-       char            *basename;
+       char            *base_name;
        
-       basename = strrchr(filename, '/');
-       if (basename) {
-               *basename++ = '\0';
+       base_name = strrchr(filename, '/');
+       if (base_name) {
+               *base_name++ = '\0';
                dir = string_to_inode(filename);
                if (!dir)
                        return;
        } else {
                dir = cwd;
-               basename = filename;
+               base_name = filename;
        }
-       retval = ext2fs_unlink(current_fs, dir, basename, 0, 0);
+       retval = ext2fs_unlink(current_fs, dir, base_name, 0, 0);
        if (retval)
                com_err("unlink_file_by_name", retval, 0);
        return;