]> wimlib.net Git - wimlib/blobdiff - src/resource.c
wim_inode_set_symlink(): Fix typo in comment
[wimlib] / src / resource.c
index f37b8958300e6cd024a8882f559ed0d043781926..8705cb1d582d01e19741052fb8e6154216f77ddc 100644 (file)
@@ -460,7 +460,7 @@ read_partial_wim_resource(const struct wim_lookup_table_entry *lte,
                                               lte->resource_entry.size,
                                               lte->resource_entry.original_size,
                                               lte->resource_entry.offset,
-                                              wimlib_get_compression_type(wim),
+                                              wim->compression_type,
                                               size,
                                               offset,
                                               cb,
@@ -754,8 +754,8 @@ sha1_resource(struct wim_lookup_table_entry *lte)
 
 /*
  * Copies the file resource specified by the lookup table entry @lte from the
- * input WIM to the output WIM that has its FILE * given by
- * ((WIMStruct*)wim)->out_fp.
+ * input WIM to the output WIM that has its output file descriptor given by
+ * ((WIMStruct*)_wim)->out_fd.
  *
  * The output_resource_entry, out_refcnt, and part_number fields of @lte are
  * updated.
@@ -763,17 +763,17 @@ sha1_resource(struct wim_lookup_table_entry *lte)
  * (This function is confusing and should be refactored somehow.)
  */
 int
-copy_resource(struct wim_lookup_table_entry *lte, void *wim)
+copy_resource(struct wim_lookup_table_entry *lte, void *_wim)
 {
-       WIMStruct *w = wim;
+       WIMStruct *wim = _wim;
        int ret;
 
-       ret = write_wim_resource(lte, w->out_fd,
+       ret = write_wim_resource(lte, wim->out_fd,
                                 wim_resource_compression_type(lte),
                                 &lte->output_resource_entry, 0);
        if (ret == 0) {
                lte->out_refcnt = lte->refcnt;
-               lte->part_number = w->hdr.part_number;
+               lte->part_number = wim->hdr.part_number;
        }
        return ret;
 }