]> wimlib.net Git - wimlib/blobdiff - src/join.c
typo
[wimlib] / src / join.c
index 94ce400b78bb4a41bb1705752b06172e36c0205b..496b31812acd5d63550597f31bc76654431738c0 100644 (file)
@@ -2,23 +2,25 @@
  * join.c
  *
  * Join split WIMs (sometimes named as .swm files) together into one WIM.
- *
+ */
+
+/*
  * Copyright (C) 2012 Eric Biggers
  *
- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.
  *
- * This library 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) any
- * later version.
+ * 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)
+ * any later version.
  *
- * This library 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 details.
+ * 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
+ * details.
  *
- * You should have received a copy of the GNU Lesser General Public License along
- * with this library; if not, write to the Free Software Foundation, Inc., 59
- * Temple Place, Suite 330, Boston, MA 02111-1307 USA 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
 #include "wimlib_internal.h"
@@ -38,14 +40,14 @@ static int join_wims(WIMStruct **swms, uint num_swms, WIMStruct *joined_wim,
                if (write_flags & WIMLIB_WRITE_FLAG_SHOW_PROGRESS) {
                        off_t cur_offset = ftello(out_fp);
                        printf("Writing resources from part %u of %u "
-                                       "(%"PRIu64" of %"PRIu64" bytes, %.0f%% done)\n",
-                                       i + 1, num_swms,
-                                       cur_offset, total_bytes,
-                                       (double)cur_offset / total_bytes * 100.0);
+                              "(%"PRIu64" of %"PRIu64" bytes, %.0f%% done)\n",
+                              i + 1, num_swms, cur_offset, total_bytes,
+                              (double)cur_offset / total_bytes * 100.0);
                }
                swms[i]->fp = fopen(swms[i]->filename, "rb");
                if (!swms[i]->fp) {
-                       ERROR("Failed to reopen `%s': %m\n", swms[i]->filename);
+                       ERROR_WITH_ERRNO("Failed to reopen `%s'",
+                                        swms[i]->filename);
                        return WIMLIB_ERR_OPEN;
                }
                swms[i]->out_fp = out_fp;
@@ -65,7 +67,7 @@ static int join_wims(WIMStruct **swms, uint num_swms, WIMStruct *joined_wim,
                        swms[0]->hdr.image_count);
 
        for (i = 0; i < swms[0]->hdr.image_count; i++) {
-               ret = copy_resource(swms[0]->image_metadata[i].lookup_table_entry
+               ret = copy_resource(swms[0]->image_metadata[i].metadata_lte
                                    swms[0]);
                if (ret != 0)
                        return ret;
@@ -86,7 +88,7 @@ static int join_wims(WIMStruct **swms, uint num_swms, WIMStruct *joined_wim,
        off_t xml_data_offset = ftello(out_fp);
 
        if (lookup_table_offset == -1 || xml_data_offset == -1) {
-               ERROR("Failed to get file offset: %m\n");
+               ERROR_WITH_ERRNO("Failed to get file offset");
                return WIMLIB_ERR_WRITE;
        }
        swms[0]->hdr.lookup_table_res_entry.offset = lookup_table_offset;
@@ -127,7 +129,7 @@ WIMLIBAPI int wimlib_join(const char **swm_names, int num_swms,
                        goto err;
 
                /* don't open all the parts at the same time, in case there are
-                * a lot af them */
+                * a lot of them */
                fclose(w->fp);
                w->fp = NULL;
 
@@ -137,37 +139,37 @@ WIMLIBAPI int wimlib_join(const char **swm_names, int num_swms,
                } else {
                        if (wimlib_get_compression_type(w) != ctype) {
                                ERROR("The split WIMs do not all have the same "
-                                               "compression type!\n");
+                                     "compression type");
                                ret = WIMLIB_ERR_SPLIT_INVALID;
                                goto err;
                        }
                        if (memcmp(guid, w->hdr.guid, WIM_GID_LEN) != 0) {
-                               ERROR("The split WIMs do not all have the "
-                                               "same GUID!\n");
+                               ERROR("The split WIMs do not all have the same "
+                                     "GUID");
                                ret = WIMLIB_ERR_SPLIT_INVALID;
                                goto err;
                        }
                }
                if (w->hdr.total_parts != num_swms) {
                        ERROR("`%s' (part %d) says there are %d total parts, "
-                                       "but %d parts were specified!\n",
-                                       swm_names[i], w->hdr.part_number,
-                                       w->hdr.total_parts, num_swms);
+                             "but %d parts were specified",
+                             swm_names[i], w->hdr.part_number,
+                             w->hdr.total_parts, num_swms);
                        ret = WIMLIB_ERR_SPLIT_INVALID;
                        goto err;
                }
                if (w->hdr.part_number == 0 || w->hdr.part_number > num_swms) {
-                       ERROR("`%s' says it is part %d, but expected a number\n"
-                                       "between 1 and %d!\n",
-                               swm_names[i], w->hdr.part_number, num_swms);
+                       ERROR("`%s' says it is part %d, but expected a number "
+                             "between 1 and %d",
+                             swm_names[i], w->hdr.part_number, num_swms);
                        ret = WIMLIB_ERR_SPLIT_INVALID;
                        goto err;
                }
                part_idx = w->hdr.part_number - 1;
                if (swms[part_idx] != NULL) {
-                       ERROR("`%s' and `%s' both say they are part %d of %d!\n",
-                               swm_names[i], swms[part_idx]->filename,
-                               w->hdr.part_number, num_swms);
+                       ERROR("`%s' and `%s' both say they are part %d of %d",
+                             swm_names[i], swms[part_idx]->filename,
+                             w->hdr.part_number, num_swms);
                        ret = WIMLIB_ERR_SPLIT_INVALID;
                        goto err;
                }