Remove more trailing whitespace

[wimlib] / src / split.c

diff --git a/src/split.c b/src/split.c
index 40c861a1a356efb5276caacb7f7bdaea3b00af85..2cb5a8e44c9575b35f2fa1d36fecc8f0c7daf1f2 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -10,16 +10,16 @@
  * This file is part of wimlib, a library for working with WIM files.
  *
  * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
+ * terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option)
  * any later version.
  *
  * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
@@ -49,7 +49,7 @@ static int finish_swm(WIMStruct *w, struct lookup_table_entry *lte_chain_head,
        off_t lookup_table_offset = ftello(w->out_fp);
        int ret;
 
-       DEBUG("Writing lookup table for SWM (offset %"PRIu64")", 
+       DEBUG("Writing lookup table for SWM (offset %"PRIu64")",
                        lookup_table_offset);
 
        while (lte_chain_head != NULL) {
@@ -57,7 +57,7 @@ static int finish_swm(WIMStruct *w, struct lookup_table_entry *lte_chain_head,
                if (ret != 0)
                        return ret;
                struct lookup_table_entry *prev = lte_chain_head;
-               lte_chain_head = prev->next_lte_in_swm;
+               lte_chain_head = lte_chain_head->next_lte_in_swm;
                prev->next_lte_in_swm = NULL;
        }
        off_t xml_data_offset = ftello(w->out_fp);
@@ -65,7 +65,7 @@ static int finish_swm(WIMStruct *w, struct lookup_table_entry *lte_chain_head,
        if (lookup_table_offset == -1 || xml_data_offset == -1)
                return WIMLIB_ERR_WRITE;
        w->hdr.lookup_table_res_entry.offset = lookup_table_offset;
-       w->hdr.lookup_table_res_entry.size = 
+       w->hdr.lookup_table_res_entry.size =
                                xml_data_offset - lookup_table_offset;
        ret = finish_write(w, WIM_ALL_IMAGES, write_flags, 0);
        if (ret != 0)
@@ -88,7 +88,7 @@ static int copy_resource_to_swm(struct lookup_table_entry *lte, void *__args)
        if (lte->resource_entry.flags & WIM_RESHDR_FLAG_METADATA)
                return 0;
 
-       if (args->size_remaining < 0 || 
+       if (args->size_remaining < 0 ||
                        (u64)args->size_remaining < lte->resource_entry.size) {
 
                /* No space for this resource.  Finish the previous swm and
@@ -99,7 +99,7 @@ static int copy_resource_to_swm(struct lookup_table_entry *lte, void *__args)
                args->lte_chain_tail = NULL;
                args->lte_chain_head = NULL;
 
-               sprintf(args->swm_base_name + args->swm_base_name_len, "%d", 
+               sprintf(args->swm_base_name + args->swm_base_name_len, "%d",
                        ++args->part_number);
                strcat(args->swm_base_name, args->swm_suffix);
 
@@ -107,8 +107,8 @@ static int copy_resource_to_swm(struct lookup_table_entry *lte, void *__args)
 
                if (args->write_flags & WIMLIB_OPEN_FLAG_SHOW_PROGRESS)
                        printf("Writing `%s' (%"PRIu64" of %"PRIu64" bytes, "
-                              "%.0f%% done)\n", 
-                              args->swm_base_name, 
+                              "%.0f%% done)\n",
+                              args->swm_base_name,
                               args->total_bytes_written,
                               args->total_bytes,
                               (double)args->total_bytes_written /
@@ -131,7 +131,7 @@ static int copy_resource_to_swm(struct lookup_table_entry *lte, void *__args)
 
 /* Splits the WIM file @wimfile into multiple parts prefixed by @swm_name with
  * size at most @part_size. */
-WIMLIBAPI int wimlib_split(const char *wimfile, const char *swm_name, 
+WIMLIBAPI int wimlib_split(const char *wimfile, const char *swm_name,
                           size_t part_size, int flags)
 {
        int ret;
@@ -177,16 +177,17 @@ WIMLIBAPI int wimlib_split(const char *wimfile, const char *swm_name,
        }
 
        if (write_flags & WIMLIB_OPEN_FLAG_SHOW_PROGRESS)
-               printf("Writing `%s' (%.2f %% done)\n", 
-                       swm_name, 
+               printf("Writing `%s' (%.2f %% done)\n",
+                       swm_name,
                        (double)total_bytes_written /
                                (double)total_bytes * 100.0);
 
        w->write_metadata = true;
        for (int i = 0; i < w->hdr.image_count; i++) {
-
                struct lookup_table_entry *metadata_lte;
 
+               DEBUG("Writing metadata resource %d", i);
+
                metadata_lte = w->image_metadata[i].metadata_lte;
                ret = copy_resource(metadata_lte, w);
                if (ret != 0)
@@ -247,7 +248,7 @@ WIMLIBAPI int wimlib_split(const char *wimfile, const char *swm_name,
                put_u16(&buf[0], i);
                put_u16(&buf[2], total_parts);
 
-               if (fseek(fp, 40, SEEK_SET) != 0 || 
+               if (fseek(fp, 40, SEEK_SET) != 0 ||
                                fwrite(buf, 1, sizeof(buf), fp) != sizeof(buf)
                                || fclose(fp) != 0) {
                        ERROR_WITH_ERRNO("Error overwriting header of `%s'",