WIM chunk size: Calculate with existing macros when possible

diff --git a/include/wimlib/lookup_table.h b/include/wimlib/lookup_table.h
index 2b2cfcd9184c65f8b311e328198c52c6ff7f033e..d6bd5ee30726ecb6fb5ad22e21a4230413f1d512 100644 (file)
--- a/include/wimlib/lookup_table.h
+++ b/include/wimlib/lookup_table.h
@@ -259,7 +259,7 @@ wim_resource_size(const struct wim_lookup_table_entry *lte)
 static inline u64
 wim_resource_chunks(const struct wim_lookup_table_entry *lte)
 {
 static inline u64
 wim_resource_chunks(const struct wim_lookup_table_entry *lte)
 {

-       return (wim_resource_size(lte) + WIM_CHUNK_SIZE - 1) / WIM_CHUNK_SIZE;
+       return DIV_ROUND_UP(wim_resource_size(lte), WIM_CHUNK_SIZE);

 }
 
 static inline u64
 }
 
 static inline u64

diff --git a/src/resource.c b/src/resource.c
index d60f5476ebadd9557e948e6c7e823f5d30e536b5..29bfcd7fd0a962fb7c29d6f7621251876bc43e5d 100644 (file)
--- a/src/resource.c
+++ b/src/resource.c
@@ -97,8 +97,8 @@ read_compressed_resource(int in_fd,
 
        /* Calculate how many chunks the resource consists of in its entirety.
         * */
 
        /* Calculate how many chunks the resource consists of in its entirety.
         * */

-       u64 num_chunks = (resource_uncompressed_size + WIM_CHUNK_SIZE - 1) /
-                                                               WIM_CHUNK_SIZE;
+       u64 num_chunks = DIV_ROUND_UP(resource_uncompressed_size, WIM_CHUNK_SIZE);
+

        /* As mentioned, the first chunk has no entry in the chunk table. */
        u64 num_chunk_entries = num_chunks - 1;
 
        /* As mentioned, the first chunk has no entry in the chunk table. */
        u64 num_chunk_entries = num_chunks - 1;
 

diff --git a/src/write.c b/src/write.c
index 8451b391db9d3e1824e59eec5e29d0732223d10b..fde7e939ed57a83d4ef053ff0d69db755d96750d 100644 (file)
--- a/src/write.c
+++ b/src/write.c
@@ -104,7 +104,7 @@ begin_wim_resource_chunk_tab(const struct wim_lookup_table_entry *lte,
                             struct chunk_table **chunk_tab_ret)
 {
        u64 size = wim_resource_size(lte);
                             struct chunk_table **chunk_tab_ret)
 {
        u64 size = wim_resource_size(lte);

-       u64 num_chunks = (size + WIM_CHUNK_SIZE - 1) / WIM_CHUNK_SIZE;
+       u64 num_chunks = wim_resource_chunks(lte);

        size_t alloc_size = sizeof(struct chunk_table) + num_chunks * sizeof(u64);
        struct chunk_table *chunk_tab = CALLOC(1, alloc_size);
 
        size_t alloc_size = sizeof(struct chunk_table) + num_chunks * sizeof(u64);
        struct chunk_table *chunk_tab = CALLOC(1, alloc_size);
 


@@ -118,7 +118,7 @@ begin_wim_resource_chunk_tab(const struct wim_lookup_table_entry *lte,
        chunk_tab->file_offset = file_offset;
        chunk_tab->num_chunks = num_chunks;
        chunk_tab->original_resource_size = size;
        chunk_tab->file_offset = file_offset;
        chunk_tab->num_chunks = num_chunks;
        chunk_tab->original_resource_size = size;

-       chunk_tab->bytes_per_chunk_entry = (size >= (1ULL << 32)) ? 8 : 4;
+       chunk_tab->bytes_per_chunk_entry = (size > (1ULL << 32)) ? 8 : 4;

        chunk_tab->table_disk_size = chunk_tab->bytes_per_chunk_entry *
                                     (num_chunks - 1);
        chunk_tab->cur_offset = 0;
        chunk_tab->table_disk_size = chunk_tab->bytes_per_chunk_entry *
                                     (num_chunks - 1);
        chunk_tab->cur_offset = 0;