X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-apply.c;h=db629d94d4cd3d2c6b359510430452115198e761;hp=56b3e70128a4c3934abb1b0cef7c02d530ad95fd;hb=7231431086332de22b2556477bcc5fc2c3e4bdcf;hpb=39c533628d784ecc6b20694bf6cc78eeb531a554

diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c
index 56b3e701..db629d94 100644
--- a/src/ntfs-apply.c
+++ b/src/ntfs-apply.c
@@ -263,7 +263,7 @@ apply_file_attributes_and_security_data(ntfs_inode *ni,
 
 		sd = wim_const_security_data(w);
 		wimlib_assert(dentry->d_inode->security_id < sd->num_entries);
-		descriptor = sd->descriptors[dentry->d_inode->security_id];
+		descriptor = (const char *)sd->descriptors[dentry->d_inode->security_id];
 		DEBUG("Applying security descriptor %d to `%s'",
 		      dentry->d_inode->security_id, dentry->full_path_utf8);
 
@@ -413,8 +413,6 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni,
 	if (inode->attributes & FILE_ATTRIBUTE_DIRECTORY) {
 		type = S_IFDIR;
 	} else {
-		struct dentry *other;
-
 		/* Apply hard-linked directory in same directory with DOS name
 		 * (if there is one) before this dentry */
 		if (dentry->short_name_len == 0) {