Spelling fixes for func, struct, and macros (#2462)

(cherry picked from commit dc5e1405b630258c41e0059fd121fca222d8eabd)

diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c
index 83e8415cb705913b094d5596e5029e92879beb53..9d155c66d0924c3a1fd9a8d659c94f22f23b36cf 100644 (file)
--- a/libarchive/archive_read_support_format_rar.c
+++ b/libarchive/archive_read_support_format_rar.c
@@ -475,7 +475,7 @@ static inline uint32_t vm_read_32(struct rar_virtual_machine*, size_t);
   ((rar_br_has(br, (n)) || rar_br_fillup(a, br)) || rar_br_has(br, (n)))
 /* Notify how many bits we consumed. */
 #define rar_br_consume(br, n) ((br)->cache_avail -= (n))
-#define rar_br_consume_unalined_bits(br) ((br)->cache_avail &= ~7)
+#define rar_br_consume_unaligned_bits(br) ((br)->cache_avail &= ~7)
 
 static const uint32_t cache_masks[] = {
   0x00000000, 0x00000001, 0x00000003, 0x00000007,
@@ -2276,7 +2276,7 @@ parse_codes(struct archive_read *a)
   free_codes(a);
 
   /* Skip to the next byte */
-  rar_br_consume_unalined_bits(br);
+  rar_br_consume_unaligned_bits(br);
 
   /* PPMd block flag */
   if (!rar_br_read_ahead(a, br, 1))

diff --git a/libarchive/archive_write_set_format_iso9660.c b/libarchive/archive_write_set_format_iso9660.c
index a77ea7708b4bb063ff555e54182110f8c8ed46e5..bc86047f63599b8c82b12418d06f58c2c2c35de6 100644 (file)
--- a/libarchive/archive_write_set_format_iso9660.c
+++ b/libarchive/archive_write_set_format_iso9660.c
@@ -911,7 +911,7 @@ static int  iso9660_finish_entry(struct archive_write *);
 static int     iso9660_close(struct archive_write *);
 static int     iso9660_free(struct archive_write *);
 
-static void    get_system_identitier(char *, size_t);
+static void    get_system_identifier(char *, size_t);
 static void    set_str(unsigned char *, const char *, size_t, char,
                    const char *);
 static inline int joliet_allowed_char(unsigned char, unsigned char);
@@ -2166,7 +2166,7 @@ iso9660_free(struct archive_write *a)
  * Get the System Identifier
  */
 static void
-get_system_identitier(char *system_id, size_t size)
+get_system_identifier(char *system_id, size_t size)
 {
 #if defined(HAVE_SYS_UTSNAME_H)
        struct utsname u;
@@ -3872,7 +3872,7 @@ write_VD(struct archive_write *a, struct vdd *vdd)
        /* Unused Field */
        set_unused_field_bp(bp, 8, 8);
        /* System Identifier */
-       get_system_identitier(identifier, sizeof(identifier));
+       get_system_identifier(identifier, sizeof(identifier));
        r = set_str_a_characters_bp(a, bp, 9, 40, identifier, vdc);
        if (r != ARCHIVE_OK)
                return (r);

diff --git a/libarchive/archive_write_set_format_mtree.c b/libarchive/archive_write_set_format_mtree.c
index 6db9d27848afef8dc1a4452536874c87d06b29df..14d68516fba68b47c37cd03839dea4e3a476c1da 100644 (file)
--- a/libarchive/archive_write_set_format_mtree.c
+++ b/libarchive/archive_write_set_format_mtree.c
@@ -54,7 +54,7 @@ struct attr_counter {
        int count;
 };
 
-struct att_counter_set {
+struct attr_counter_set {
        struct attr_counter *uid_list;
        struct attr_counter *gid_list;
        struct attr_counter *mode_list;
@@ -141,7 +141,7 @@ struct mtree_writer {
                unsigned long   fflags_set;
                unsigned long   fflags_clear;
        } set;
-       struct att_counter_set  acs;
+       struct attr_counter_set acs;
        int classic;
        int depth;
 
@@ -437,7 +437,7 @@ write_global(struct mtree_writer *mtree)
 {
        struct archive_string setstr;
        struct archive_string unsetstr;
-       struct att_counter_set *acs;
+       struct attr_counter_set *acs;
        int keys, oldkeys, effkeys;
 
        archive_string_init(&setstr);
@@ -638,7 +638,7 @@ static int
 attr_counter_set_collect(struct mtree_writer *mtree, struct mtree_entry *me)
 {
        struct attr_counter *ac, *last;
-       struct att_counter_set *acs = &mtree->acs;
+       struct attr_counter_set *acs = &mtree->acs;
        int keys = mtree->keys;
 
        if (keys & (F_UNAME | F_UID)) {
@@ -714,7 +714,7 @@ attr_counter_set_collect(struct mtree_writer *mtree, struct mtree_entry *me)
 static void
 attr_counter_set_free(struct mtree_writer *mtree)
 {
-       struct att_counter_set *acs = &mtree->acs;
+       struct attr_counter_set *acs = &mtree->acs;
 
        attr_counter_free(&acs->uid_list);
        attr_counter_free(&acs->gid_list);