Rewrite to use inodes (IN PROGRESS)

[wimlib] / src / header.c

diff --git a/src/header.c b/src/header.c
index 7cd25b1158cbba214a29f030acb27e544e0f8f55..e7dd900904a93b0a883725799a85df1bd922b5d5 100644 (file)
--- a/src/header.c
+++ b/src/header.c
@@ -11,16 +11,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/.
  */
 
@@ -96,8 +96,7 @@ int read_header(FILE *fp, struct wim_header *hdr, int split_ok)
                ERROR("Unexpected chunk size of %u! Ask the author to "
                      "implement support for other chunk sizes.",
                      chunk_size);
-               ERROR("(Or it might just be that the WIM header is "
-                     "invalid.)", chunk_size);
+               ERROR("(Or it might just be that the WIM header is invalid.)");
                return WIMLIB_ERR_INVALID_CHUNK_SIZE;
        }
 
@@ -185,6 +184,7 @@ int write_header(const struct wim_header *hdr, FILE *out_fp)
                ERROR_WITH_ERRNO("Failed to write WIM header");
                return WIMLIB_ERR_WRITE;
        }
+       DEBUG("Done writing WIM header");
        return 0;
 }
 
@@ -253,8 +253,8 @@ WIMLIBAPI void wimlib_print_header(const WIMStruct *w)
        fputs ("GUID                        = ", stdout);
        print_byte_field(hdr->guid, WIM_GID_LEN);
        putchar('\n');
-       printf("Part Number                 = %hu\n", 1);
-       printf("Total Parts                 = %hu\n", 1);
+       printf("Part Number                 = %hu\n", w->hdr.part_number);
+       printf("Total Parts                 = %hu\n", w->hdr.total_parts);
        printf("Image Count                 = %u\n", hdr->image_count);
        printf("Lookup Table Size           = %"PRIu64"\n", 
                                (u64)hdr->lookup_table_res_entry.size);