config: update config.{guess,sub}

[tools/e2fsprogs.git] / debugfs / xattrs.c

diff --git a/debugfs/xattrs.c b/debugfs/xattrs.c
index 6c32712..bd11450 100644 (file)
--- a/debugfs/xattrs.c
+++ b/debugfs/xattrs.c
@@ -117,7 +117,8 @@ out:
        err = ext2fs_xattrs_close(&h);
 }
 
-void do_list_xattr(int argc, char **argv)
+void do_list_xattr(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+                  void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t ino;
 
@@ -137,7 +138,8 @@ void do_list_xattr(int argc, char **argv)
        dump_inode_attributes(stdout, ino);
 }
 
-void do_get_xattr(int argc, char **argv)
+void do_get_xattr(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+                 void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t ino;
        struct ext2_xattr_handle *h;
@@ -234,7 +236,8 @@ out2:
                fclose(fp);
 }
 
-void do_set_xattr(int argc, char **argv)
+void do_set_xattr(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+                 void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t ino;
        struct ext2_xattr_handle *h;
@@ -317,7 +320,8 @@ out2:
        }
 }
 
-void do_rm_xattr(int argc, char **argv)
+void do_rm_xattr(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+                void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t ino;
        struct ext2_xattr_handle *h;
@@ -406,7 +410,6 @@ static void dump_xattr_raw_entries(FILE *f, unsigned char *buf,
                                   unsigned value_start)
 {
        struct ext2_ext_attr_entry ent;
-       char *name;
        unsigned int off = start;
        unsigned int vstart;
 
@@ -417,7 +420,6 @@ static void dump_xattr_raw_entries(FILE *f, unsigned char *buf,
                        break;
                }
                if ((off + sizeof(struct ext2_ext_attr_entry)) >= len) {
-               overrun:
                        fprintf(f, "xattr buffer overrun at %u (len = %u)\n",
                                off, len);
                        break;
@@ -450,13 +452,13 @@ static void dump_xattr_raw_entries(FILE *f, unsigned char *buf,
                else if (ent.e_value_offs >= len ||
                         (vstart + ent.e_value_size) > len)
                        fprintf(f, "<runs off end>");
-               if (is_mostly_printable((char *)(buf + vstart),
+               else if (is_mostly_printable((char *)(buf + vstart),
                                        ent.e_value_size))
                        safe_print(f, (char *)(buf + vstart),
                                   ent.e_value_size);
                else {
                        fprintf(f, "<hexdump>\n");
-                       do_byte_hexdump(f, (char *)(buf + vstart),
+                       do_byte_hexdump(f, (unsigned char *)(buf + vstart),
                                        ent.e_value_size);
                }
                fputc('\n', f);