compiler.h: remove _packed_attribute

[wimlib] / src / integrity.c

diff --git a/src/integrity.c b/src/integrity.c
index fc9b8859b53e632062821df0afa1682cec97d803..ce07acc6b7e6673f2a87ea2c5e2cf271d22d1ff9 100644 (file)
--- a/src/integrity.c
+++ b/src/integrity.c
@@ -52,14 +52,14 @@ struct integrity_table {
        u32 num_entries;
        u32 chunk_size;
        u8  sha1sums[][20];
-} _packed_attribute;
+} __attribute__((packed));
 
 static int
 calculate_chunk_sha1(struct filedes *in_fd, size_t this_chunk_size,
                     off_t offset, u8 sha1_md[])
 {
        u8 buf[BUFFER_SIZE];
-       SHA_CTX ctx;
+       struct sha1_ctx ctx;
        size_t bytes_remaining;
        size_t bytes_to_read;
        int ret;
@@ -78,7 +78,7 @@ calculate_chunk_sha1(struct filedes *in_fd, size_t this_chunk_size,
                bytes_remaining -= bytes_to_read;
                offset += bytes_to_read;
        } while (bytes_remaining);
-       sha1_final(sha1_md, &ctx);
+       sha1_final(&ctx, sha1_md);
        return 0;
 }
 
@@ -122,9 +122,9 @@ read_integrity_table(WIMStruct *wim, u64 num_checked_bytes,
                return ret;
        table = buf;
 
-       table->size        = le32_to_cpu(table->size);
-       table->num_entries = le32_to_cpu(table->num_entries);
-       table->chunk_size  = le32_to_cpu(table->chunk_size);
+       table->size        = le32_to_cpu((_force_attr le32)table->size);
+       table->num_entries = le32_to_cpu((_force_attr le32)table->num_entries);
+       table->chunk_size  = le32_to_cpu((_force_attr le32)table->chunk_size);
 
        if (table->size != wim->hdr.integrity_table_reshdr.uncompressed_size ||
            table->size != (u64)table->num_entries * SHA1_HASH_SIZE + 12 ||
@@ -313,9 +313,9 @@ write_integrity_table(WIMStruct *wim,
 
        new_table_size = new_table->size;
 
-       new_table->size        = cpu_to_le32(new_table->size);
-       new_table->num_entries = cpu_to_le32(new_table->num_entries);
-       new_table->chunk_size  = cpu_to_le32(new_table->chunk_size);
+       new_table->size        = (_force_attr u32)cpu_to_le32(new_table->size);
+       new_table->num_entries = (_force_attr u32)cpu_to_le32(new_table->num_entries);
+       new_table->chunk_size  = (_force_attr u32)cpu_to_le32(new_table->chunk_size);
 
        ret = write_wim_resource_from_buffer(new_table,
                                             new_table_size,