resource_compressed_size,
resource_uncompressed_size,
resource_offset);
- DEBUG2("resource_ctype = %s, len = %"PRIu64", offset = %"PRIu64"",
+ DEBUG2("resource_ctype = %"TS", len = %"PRIu64", offset = %"PRIu64"",
wimlib_get_compression_type_string(resource_ctype), len, offset);
/* Trivial case */
if (len == 0)
goto out;
}
}
- DEBUG("Opening extra file descriptor to `%s'", w->filename);
- fp = fopen(w->filename, "rb");
+ DEBUG("Opening extra file descriptor to `%"TS"'", w->filename);
+ fp = tfopen(w->filename, T("rb"));
if (!fp)
- ERROR_WITH_ERRNO("Failed to open `%s'", w->filename);
+ ERROR_WITH_ERRNO("Failed to open `%"TS"'", w->filename);
out:
pthread_mutex_unlock(&w->fp_tab_mutex);
return fp;
if (lte->file_on_disk_fp) {
fp = lte->file_on_disk_fp;
} else {
- fp = fopen(lte->file_on_disk, "rb");
+ fp = tfopen(lte->file_on_disk, T("rb"));
if (!fp) {
ERROR_WITH_ERRNO("Failed to open the file "
- "`%s'", lte->file_on_disk);
+ "`%"TS"'", lte->file_on_disk);
ret = WIMLIB_ERR_OPEN;
break;
}
#ifdef __WIN32__
case RESOURCE_WIN32:
wimlib_assert(lte->win32_file_on_disk_fp != INVALID_HANDLE_VALUE);
- ret = win32_read_file(lte->win32_file_on_disk,
- lte->win32_file_on_disk_fp, offset, size,
- buf);
+ ret = win32_read_file(lte->file_on_disk,
+ lte->win32_file_on_disk_fp, offset,
+ size, buf);
break;
#endif
case RESOURCE_IN_ATTACHED_BUFFER:
offset += 8;
if (ntfs_attr_pread(lte->attr, offset, size, buf) != size) {
ERROR_WITH_ERRNO("Error reading NTFS attribute "
- "at `%s'",
+ "at `%"TS"'",
lte->ntfs_loc->path);
ret = WIMLIB_ERR_NTFS_3G;
}
WIMStruct *w = wim;
int ret;
- if ((lte->resource_entry.flags & WIM_RESHDR_FLAG_METADATA) &&
- !w->write_metadata)
- return 0;
-
ret = write_wim_resource(lte, w->out_fp,
wim_resource_compression_type(lte),
<e->output_resource_entry, 0);
- if (ret != 0)
- return ret;
- lte->out_refcnt = lte->refcnt;
- lte->part_number = w->hdr.part_number;
- return 0;
+ if (ret == 0) {
+ lte->out_refcnt = lte->refcnt;
+ lte->part_number = w->hdr.part_number;
+ }
+ return ret;
}