Fix a few format strings

diff --git a/include/wimlib/error.h b/include/wimlib/error.h
index 522264021d3089bf80614c1a1000abc4f4067b60..24f09de97633b69d79ab90274af9373c6c7abf02 100644 (file)
--- a/include/wimlib/error.h
+++ b/include/wimlib/error.h
@@ -19,8 +19,8 @@ wimlib_printf(const tchar *format, ...) _format_attribute(printf, 1, 2);
 #endif /* !__WIN32__ */
 
 
 #endif /* !__WIN32__ */
 
 

-static inline int
-dummy_tprintf(const tchar *format, ...) _format_attribute(printf, 1, 2)
+static inline int _format_attribute(printf, 1, 2)
+dummy_tprintf(const tchar *format, ...)

 {
        return 0;
 }
 {
        return 0;
 }

diff --git a/src/compress_parallel.c b/src/compress_parallel.c
index eeb9f6f242dbcd2575dc983e2477e6955e94071b..c99c0a86826bc66b841a45ffe1224f57e195f6ab 100644 (file)
--- a/src/compress_parallel.c
+++ b/src/compress_parallel.c
@@ -531,7 +531,9 @@ new_parallel_chunk_compressor(int out_ctype, u32 out_chunk_size,
                if (ret) {
                        errno = ret;
                        ret = WIMLIB_ERR_NOMEM;
                if (ret) {
                        errno = ret;
                        ret = WIMLIB_ERR_NOMEM;

-                       WARNING_WITH_ERRNO("Failed to create compressor thread %u of %u");
+                       WARNING_WITH_ERRNO("Failed to create compressor thread %u of %u",
+                                          ctx->num_started_threads + 1,
+                                          num_threads);

                        goto err;
                }
        }
                        goto err;
                }
        }

diff --git a/src/header.c b/src/header.c
index f52c72b7562a852e36b09e9a350dcd00316558e2..e4c6d67c092aa98a1ac3dc71f5cf4ce5090f4a15 100644 (file)
--- a/src/header.c
+++ b/src/header.c
@@ -117,7 +117,8 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr)
        if (hdr->wim_version != WIM_VERSION_DEFAULT &&
            hdr->wim_version != WIM_VERSION_PACKED_STREAMS)
        {
        if (hdr->wim_version != WIM_VERSION_DEFAULT &&
            hdr->wim_version != WIM_VERSION_PACKED_STREAMS)
        {

-               ERROR("\"%"TS"\": Unknown WIM version: %u", hdr->wim_version);
+               ERROR("\"%"TS"\": Unknown WIM version: %u",
+                     filename, hdr->wim_version);

                return WIMLIB_ERR_UNKNOWN_VERSION;
        }
 
                return WIMLIB_ERR_UNKNOWN_VERSION;
        }
 

diff --git a/src/xml.c b/src/xml.c
index 9ef6f65f12cdc7be084a4bcdf231f45fb45cd686..7ff9c615cda47af72b6366d18ce2e10fe5e39dbb 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -1575,7 +1575,7 @@ write_wim_xml_data(WIMStruct *wim, int image, u64 total_bytes,
        size_t xml_len;
 
        DEBUG("Writing WIM XML data (image=%d, offset=%"PRIu64")",
        size_t xml_len;
 
        DEBUG("Writing WIM XML data (image=%d, offset=%"PRIu64")",

-             image, total_bytes, wim->out_fd.offset);
+             image, wim->out_fd.offset);

 
        ret = prepare_wim_xml_data(wim, image, total_bytes,
                                   &xml_data, &xml_len);
 
        ret = prepare_wim_xml_data(wim, image, total_bytes,
                                   &xml_data, &xml_len);