X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fdentry.c;h=03d56fc78f4c7bbaf9098b79b15fd7930a28bc37;hb=88a9d8314ba480d0eb7be351581d2be183efa91e;hp=90cadb433190f53742e17965ad65598199056861;hpb=c7af42d3d894338bbd1cb7f4b77948f746485482;p=wimlib diff --git a/src/dentry.c b/src/dentry.c index 90cadb43..03d56fc7 100644 --- a/src/dentry.c +++ b/src/dentry.c @@ -1117,9 +1117,9 @@ void inode_remove_ads(struct wim_inode *inode, u16 idx, destroy_ads_entry(ads_entry); - memcpy(&inode->i_ads_entries[idx], - &inode->i_ads_entries[idx + 1], - (inode->i_num_ads - idx - 1) * sizeof(inode->i_ads_entries[0])); + memmove(&inode->i_ads_entries[idx], + &inode->i_ads_entries[idx + 1], + (inode->i_num_ads - idx - 1) * sizeof(inode->i_ads_entries[0])); inode->i_num_ads--; } #endif @@ -1473,7 +1473,7 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, * u64 reserved1; (always 0) * u64 reserved2; (always 0) * };*/ - DEBUG("Dentry for file or directory `%s' has %zu extra " + DEBUG("Dentry for file or directory `%s' has %"PRIu64" extra " "bytes of data", file_name_utf8, dentry->length - calculated_size); }