Various changes

[wimlib] / src / write.c

diff --git a/src/write.c b/src/write.c
index 86730ff7fec7a1158b6ed8bed305ec784b9375aa..737112f09fefd30c711786b1e92d2821e7bb43c1 100644 (file)
--- a/src/write.c
+++ b/src/write.c
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
@@ -835,10 +835,11 @@ static int main_writer_thread_proc(struct list_head *stream_list,
                for (size_t j = 0; j < MAX_CHUNKS_PER_MSG; j++) {
                        msgs[i].compressed_chunks[j] = MALLOC(WIM_CHUNK_SIZE);
 
-                       // The extra 8 bytes is because longest_match() in lz.c
-                       // may read a little bit off the end of the uncompressed
-                       // data.  It doesn't need to be initialized--- we really
-                       // just need to avoid accessing an unmapped page.
+                       // The extra 8 bytes is because longest_match() in
+                       // lz77.c may read a little bit off the end of the
+                       // uncompressed data.  It doesn't need to be
+                       // initialized--- we really just need to avoid accessing
+                       // an unmapped page.
                        msgs[i].uncompressed_chunks[j] = MALLOC(WIM_CHUNK_SIZE + 8);
                        if (msgs[i].compressed_chunks[j] == NULL ||
                            msgs[i].uncompressed_chunks[j] == NULL)
@@ -1265,8 +1266,8 @@ out_join:
 
        for (unsigned i = 0; i < num_threads; i++) {
                if (pthread_join(compressor_threads[i], NULL)) {
-                       WARNING("Failed to join compressor thread %u: %s",
-                               i, strerror(errno));
+                       WARNING_WITH_ERRNO("Failed to join compressor "
+                                          "thread %u", i);
                }
        }
        FREE(compressor_threads);
@@ -1353,8 +1354,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)
        {
+       #ifdef ENABLE_ERROR_MESSAGES
                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;
        }
 
@@ -1601,8 +1604,8 @@ int lock_wim(WIMStruct *w, FILE *fp)
                                      "        by another process!", w->filename);
                                ret = WIMLIB_ERR_ALREADY_LOCKED;
                        } else {
-                               WARNING("Failed to lock `%s': %s",
-                                       w->filename, strerror(errno));
+                               WARNING_WITH_ERRNO("Failed to lock `%s'",
+                                                  w->filename);
                                ret = 0;
                        }
                } else {
@@ -1640,8 +1643,7 @@ void close_wim_writable(WIMStruct *w)
 {
        if (w->out_fp) {
                if (fclose(w->out_fp) != 0) {
-                       WARNING("Failed to close output WIM: %s",
-                               strerror(errno));
+                       WARNING_WITH_ERRNO("Failed to close output WIM");
                }
                w->out_fp = NULL;
        }
@@ -1927,8 +1929,8 @@ static int overwrite_wim_via_tmpfile(WIMStruct *w, int write_flags,
        w->fp = fopen(w->filename, "rb");
        if (w->fp == NULL) {
                ret = WIMLIB_ERR_REOPEN;
-               WARNING("Failed to re-open `%s' read-only: %s",
-                       w->filename, strerror(errno));
+               WARNING_WITH_ERRNO("Failed to re-open `%s' read-only",
+                                  w->filename);
                FREE(w->filename);
                w->filename = NULL;
        }
@@ -1936,7 +1938,7 @@ static int overwrite_wim_via_tmpfile(WIMStruct *w, int write_flags,
 err:
        /* Remove temporary file. */
        if (unlink(tmpfile) != 0)
-               WARNING("Failed to remove `%s': %s", tmpfile, strerror(errno));
+               WARNING_WITH_ERRNO("Failed to remove `%s'", tmpfile);
        return ret;
 }