Always use abbreviated integer types in library code

[wimlib] / src / unix_apply.c

diff --git a/src/unix_apply.c b/src/unix_apply.c
index a0b62519c02a974b46a7df8a80f341703c24621b..3f613537f94578776c3c8125de36d7ce9af7931b 100644 (file)
--- a/src/unix_apply.c
+++ b/src/unix_apply.c
@@ -472,11 +472,11 @@ unix_create_dirs_and_empty_files(const struct list_head *dentry_list,
 
 static void
 unix_count_dentries(const struct list_head *dentry_list,
-                   uint64_t *dir_count_ret, uint64_t *empty_file_count_ret)
+                   u64 *dir_count_ret, u64 *empty_file_count_ret)
 {
        const struct wim_dentry *dentry;
-       uint64_t dir_count = 0;
-       uint64_t empty_file_count = 0;
+       u64 dir_count = 0;
+       u64 empty_file_count = 0;
 
        list_for_each_entry(dentry, dentry_list, d_extraction_list_node) {
 
@@ -503,9 +503,8 @@ unix_create_symlink(const struct wim_inode *inode, const char *path,
        int ret;
        struct blob_descriptor blob_override;
 
-       blob_override.blob_location = BLOB_IN_ATTACHED_BUFFER;
-       blob_override.attached_buffer = (void *)rpdata;
-       blob_override.size = rpdatalen;
+       blob_set_is_located_in_attached_buffer(&blob_override,
+                                              (void *)rpdata, rpdatalen);
 
        ret = wim_inode_readlink(inode, link_target,
                                 sizeof(link_target) - 1, &blob_override);
@@ -724,8 +723,8 @@ unix_extract(struct list_head *dentry_list, struct apply_ctx *_ctx)
        int ret;
        struct unix_apply_ctx *ctx = (struct unix_apply_ctx *)_ctx;
        size_t path_max;
-       uint64_t dir_count;
-       uint64_t empty_file_count;
+       u64 dir_count;
+       u64 empty_file_count;
 
        /* Compute the maximum path length that will be needed, then allocate
         * some path buffers.  */