print_lookup_table_entry(): add FILE* parameter

[wimlib] / src / write.c

diff --git a/src/write.c b/src/write.c
index 777fa2c01b7089bfb2c76a5213157e1b4a6e8ab4..1f471d6fead32e046b969efa428b7abf1094b04e 100644 (file)
--- a/src/write.c
+++ b/src/write.c
@@ -1353,8 +1353,10 @@ static int lte_overwrite_prepare(struct wim_lookup_table_entry *lte, void *arg)
            lte->wim == args->wim &&
            lte->resource_entry.offset + lte->resource_entry.size > args->end_offset)
        {
            lte->wim == args->wim &&
            lte->resource_entry.offset + lte->resource_entry.size > args->end_offset)
        {

+       #ifdef ENABLE_ERROR_MESSAGES

                ERROR("The following resource is after the XML data:");
                ERROR("The following resource is after the XML data:");

-               print_lookup_table_entry(lte);
+               print_lookup_table_entry(lte, stderr);
+       #endif

                return WIMLIB_ERR_RESOURCE_ORDER;
        }
 
                return WIMLIB_ERR_RESOURCE_ORDER;
        }
 


@@ -1867,7 +1869,9 @@ out_ftruncate:
        if (ret != 0 && !(write_flags & WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE)) {
                WARNING("Truncating `%s' to its original size (%"PRIu64" bytes)",
                        w->filename, old_wim_end);
        if (ret != 0 && !(write_flags & WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE)) {
                WARNING("Truncating `%s' to its original size (%"PRIu64" bytes)",
                        w->filename, old_wim_end);

-               truncate(w->filename, old_wim_end);
+               /* Return value of truncate() is ignored because this is already
+                * an error path. */
+               (void)truncate(w->filename, old_wim_end);

        }
        w->wim_locked = 0;
        return ret;
        }
        w->wim_locked = 0;
        return ret;