join_wims(): Don't rebuild metadata resources

[wimlib] / src / ntfs-apply.c

diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c
index 245e0b55c3a1feb1d807e5979d556cd9401cb42c..ca73db2ffc9ac83593d5d8ed59ef7e67a291be27 100644 (file)
--- a/src/ntfs-apply.c
+++ b/src/ntfs-apply.c
@@ -43,8 +43,9 @@
 #include <string.h>
 #include <locale.h>
 
-static int extract_wim_chunk_to_ntfs_attr(const void *buf, size_t len,
-                                         u64 offset, void *arg)
+static int
+extract_wim_chunk_to_ntfs_attr(const void *buf, size_t len,
+                              u64 offset, void *arg)
 {
        ntfs_attr *na = arg;
        if (ntfs_attr_pwrite(na, offset, len, buf) == len) {
@@ -82,8 +83,9 @@ extract_wim_resource_to_ntfs_attr(const struct wim_lookup_table_entry *lte,
  *
  * Returns 0 on success, nonzero on failure.
  */
-static int write_ntfs_data_streams(ntfs_inode *ni, const struct wim_dentry *dentry,
-                                  union wimlib_progress_info *progress_info)
+static int
+write_ntfs_data_streams(ntfs_inode *ni, const struct wim_dentry *dentry,
+                       union wimlib_progress_info *progress_info)
 {
        int ret = 0;
        unsigned stream_idx = 0;
@@ -300,7 +302,7 @@ apply_file_attributes_and_security_data(ntfs_inode *ni,
                return WIMLIB_ERR_NTFS_3G;
        }
        if (inode->i_security_id != -1 &&
-           !(extract_flags & WIMLIB_EXTRACT_FLAG_NOACLS))
+           !(extract_flags & WIMLIB_EXTRACT_FLAG_NO_ACLS))
        {
                const char *desc;
                const struct wim_security_data *sd;
@@ -328,8 +330,9 @@ apply_file_attributes_and_security_data(ntfs_inode *ni,
  * Transfers the reparse data from a WIM inode (which must represent a reparse
  * point) to a NTFS inode.
  */
-static int apply_reparse_data(ntfs_inode *ni, const struct wim_dentry *dentry,
-                             union wimlib_progress_info *progress_info)
+static int
+apply_reparse_data(ntfs_inode *ni, const struct wim_dentry *dentry,
+                  union wimlib_progress_info *progress_info)
 {
        struct wim_lookup_table_entry *lte;
        int ret = 0;