From 9660df49a3f0388613dab3cc4c4ee93e85a6110b Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sun, 14 May 2006 18:45:57 +0100 Subject: Remove XATTR struct typedefs Signed-off-by: David Woodhouse --- include/mtd/jffs2-user.h | 24 ++++++++++++------------ mkfs.jffs2.c | 28 ++++++++++++++-------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/include/mtd/jffs2-user.h b/include/mtd/jffs2-user.h index 8b53990..bc5d99a 100644 --- a/include/mtd/jffs2-user.h +++ b/include/mtd/jffs2-user.h @@ -50,33 +50,33 @@ extern int target_endian; #define XATTR_TRUSTED_PREFIX "trusted." #define XATTR_TRUSTED_PREFIX_LEN (sizeof (XATTR_TRUSTED_PREFIX) - 1) -typedef struct { +struct jffs2_acl_entry { jint16_t e_tag; jint16_t e_perm; jint32_t e_id; -} jffs2_acl_entry; +}; -typedef struct { +struct jffs2_acl_entry_short { jint16_t e_tag; jint16_t e_perm; -} jffs2_acl_entry_short; +}; -typedef struct { +struct jffs2_acl_header { jint32_t a_version; -} jffs2_acl_header; +}; /* copied from include/linux/posix_acl_xattr.h */ #define POSIX_ACL_XATTR_VERSION 0x0002 -typedef struct { +struct posix_acl_xattr_entry { uint16_t e_tag; uint16_t e_perm; uint32_t e_id; -} posix_acl_xattr_entry; +}; -typedef struct { - uint32_t a_version; - posix_acl_xattr_entry a_entries[0]; -} posix_acl_xattr_header; +struct posix_acl_xattr_header { + uint32_t a_version; + struct posix_acl_xattr_entry a_entries[0]; +}; #endif /* __JFFS2_USER_H__ */ diff --git a/mkfs.jffs2.c b/mkfs.jffs2.c index 02f57f9..fa4a5f3 100644 --- a/mkfs.jffs2.c +++ b/mkfs.jffs2.c @@ -1052,22 +1052,22 @@ static struct { { 0, NULL, 0 } }; -static void formalize_posix_acl(char *xvalue, int *value_len) +static void formalize_posix_acl(void *xvalue, int *value_len) { - posix_acl_xattr_header *pacl_header; - posix_acl_xattr_entry *pent, *plim; - jffs2_acl_header *jacl_header; - jffs2_acl_entry *jent; - jffs2_acl_entry_short *jent_s; + struct posix_acl_xattr_header *pacl_header; + struct posix_acl_xattr_entry *pent, *plim; + struct jffs2_acl_header *jacl_header; + struct jffs2_acl_entry *jent; + struct jffs2_acl_entry_short *jent_s; char buffer[XATTR_BUFFER_SIZE]; int offset = 0; - pacl_header = (posix_acl_xattr_header *)xvalue;; + pacl_header = xvalue;; pent = pacl_header->a_entries; - plim = (posix_acl_xattr_entry *)(xvalue + *value_len); + plim = xvalue + *value_len; - jacl_header = (jffs2_acl_header *)buffer; - offset += sizeof(jffs2_acl_header); + jacl_header = (struct jffs2_acl_header *)buffer; + offset += sizeof(struct jffs2_acl_header); jacl_header->a_version = cpu_to_je32(JFFS2_ACL_VERSION); while (pent < plim) { @@ -1076,15 +1076,15 @@ static void formalize_posix_acl(char *xvalue, int *value_len) case ACL_GROUP_OBJ: case ACL_MASK: case ACL_OTHER: - jent_s = (jffs2_acl_entry_short *)(buffer + offset); - offset += sizeof(jffs2_acl_entry_short); + jent_s = (struct jffs2_acl_entry_short *)(buffer + offset); + offset += sizeof(struct jffs2_acl_entry_short); jent_s->e_tag = cpu_to_je16(le16_to_cpu(pent->e_tag)); jent_s->e_perm = cpu_to_je16(le16_to_cpu(pent->e_perm)); break; case ACL_USER: case ACL_GROUP: - jent = (jffs2_acl_entry *)(buffer + offset); - offset += sizeof(jffs2_acl_entry); + jent = (struct jffs2_acl_entry *)(buffer + offset); + offset += sizeof(struct jffs2_acl_entry); jent->e_tag = cpu_to_je16(le16_to_cpu(pent->e_tag)); jent->e_perm = cpu_to_je16(le16_to_cpu(pent->e_perm)); jent->e_id = cpu_to_je32(le32_to_cpu(pent->e_id)); -- cgit v1.2.3