Rename dentry name fields

[wimlib] / src / verify.c

diff --git a/src/verify.c b/src/verify.c
index 81aa96d085fdf5e3ded1718af6d44115c05c4f7a..1ca5be46d57a9c3c41696e4291e2765f5346f9b1 100644 (file)
--- a/src/verify.c
+++ b/src/verify.c
@@ -71,7 +71,7 @@ end_verify_blob(struct blob_descriptor *blob, int status, void *_ctx)
                return status;
 
        if (ctx->next_progress == progress->verify_streams.total_bytes) {
-               ctx->next_progress = ~(uint64_t)0;
+               ctx->next_progress = ~(u64)0;
                return 0;
        }
 
@@ -93,8 +93,8 @@ end_verify_blob(struct blob_descriptor *blob, int status, void *_ctx)
 }
 
 static int
-verify_image_blobs_present(struct wim_image_metadata *imd,
-                          struct blob_table *blob_table)
+verify_file_data_present(struct wim_image_metadata *imd,
+                        struct blob_table *blob_table)
 {
        struct wim_inode *inode;
        int ret;
@@ -116,9 +116,9 @@ wimlib_verify_wim(WIMStruct *wim, int verify_flags)
        union wimlib_progress_info progress;
        struct verify_blob_list_ctx ctx;
        struct blob_descriptor *blob;
-       struct read_blob_list_callbacks cbs = {
-               .end_blob = end_verify_blob,
-               .end_blob_ctx = &ctx,
+       struct read_blob_callbacks cbs = {
+               .end_blob       = end_verify_blob,
+               .ctx            = &ctx,
        };
 
        /* Check parameters  */
@@ -150,8 +150,8 @@ wimlib_verify_wim(WIMStruct *wim, int verify_flags)
                        if (ret)
                                return ret;
 
-                       ret = verify_image_blobs_present(wim_get_current_image_metadata(wim),
-                                                        wim->blob_table);
+                       ret = verify_file_data_present(wim_get_current_image_metadata(wim),
+                                                      wim->blob_table);
                        if (ret)
                                return ret;