X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-apply.c;h=108418b3444c8020b0f2d5f65d7fc2a3a1237e7f;hp=47e12c02db759cc05df6888e882f96316a3ac8ed;hb=239e67483b8d6759fa97f25a65011cc3480368bc;hpb=60b8f54df8fed44136bdc8ec615ee62703d87b69

diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c
index 47e12c02..108418b3 100644
--- a/src/ntfs-apply.c
+++ b/src/ntfs-apply.c
@@ -48,9 +48,12 @@ struct ntfs_apply_args {
 	WIMStruct *w;
 };
 
-extern int ntfs_inode_set_security(ntfs_inode *ni, u32 selection,
+
+#ifndef WITH_NEW_NTFS_3G
+extern int ntfs_set_inode_security(ntfs_inode *ni, u32 selection,
 				   const char *attr);
-extern int ntfs_inode_set_attributes(ntfs_inode *ni, s32 attrib);
+extern int ntfs_set_inode_attributes(ntfs_inode *ni, u32 attrib);
+#endif
 
 /* 
  * Extracts a WIM resource to a NTFS attribute.
@@ -239,7 +242,7 @@ apply_file_attributes_and_security_data(ntfs_inode *ni,
 {
 	DEBUG("Setting NTFS file attributes on `%s' to %#"PRIx32,
 	      dentry->full_path_utf8, dentry->attributes);
-	if (!ntfs_inode_set_attributes(ni, dentry->attributes)) {
+	if (ntfs_set_inode_attributes(ni, dentry->attributes)) {
 		ERROR("Failed to set NTFS file attributes on `%s'",
 		       dentry->full_path_utf8);
 		return WIMLIB_ERR_NTFS_3G;
@@ -257,8 +260,8 @@ apply_file_attributes_and_security_data(ntfs_inode *ni,
 				DACL_SECURITY_INFORMATION  |
 				SACL_SECURITY_INFORMATION;
 				
-		if (!ntfs_inode_set_security(ni, selection,
-					     (const char*)sd->descriptors[dentry->security_id]))
+		if (ntfs_set_inode_security(ni, selection,
+					    (const char*)sd->descriptors[dentry->security_id]))
 		{
 			ERROR_WITH_ERRNO("Failed to set security data on `%s'",
 					dentry->full_path_utf8);
@@ -349,7 +352,9 @@ static int preapply_dentry_with_dos_name(struct dentry *dentry,
 		}
 	}
 	/* If there's a dentry with a DOS name, extract it first */
-	if (dentry_with_dos_name && !dentry_with_dos_name->extracted_file) {
+	if (dentry_with_dos_name
+	    && !dentry_with_dos_name->extracted_file)
+	{
 		char *p;
 		const char *dir_name;
 		char orig;