header cleanups

[wimlib] / src / split.c

diff --git a/src/split.c b/src/split.c
index a611816da99a79c929213b3011693e229d5c9a8b..24c2acf74b69a0fc532aff99408b79de2660bff7 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -7,20 +7,18 @@
 /*
  * Copyright (C) 2012, 2013 Eric Biggers
  *
- * This file is part of wimlib, a library for working with WIM files.
+ * This file 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 3 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 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 General Public License for more
+ * This file 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 General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -28,6 +26,7 @@
 #endif
 
 #include "wimlib.h"
+#include "wimlib/alloca.h"
 #include "wimlib/error.h"
 #include "wimlib/list.h"
 #include "wimlib/lookup_table.h"
@@ -37,12 +36,6 @@
 #include "wimlib/wim.h"
 #include "wimlib/write.h"
 
-#ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
-#else
-#  include <stdlib.h>
-#endif
-
 struct swm_part_info {
        struct list_head stream_list;
        u64 size;
@@ -97,7 +90,6 @@ write_split_wim(WIMStruct *orig_wim, const tchar *swm_name,
        for (part_number = 1; part_number <= swm_info->num_parts; part_number++)
                progress.split.total_bytes += swm_info->parts[part_number - 1].size;
        progress.split.total_parts = swm_info->num_parts;
-       progress.split.part_name = swm_name_buf;
 
        randomize_byte_array(guid, WIMLIB_GUID_LEN);
 
@@ -111,6 +103,7 @@ write_split_wim(WIMStruct *orig_wim, const tchar *swm_name,
                }
 
                progress.split.cur_part_number = part_number;
+               progress.split.part_name = swm_name_buf;
 
                ret = call_progress(orig_wim->progfunc,
                                    WIMLIB_PROGRESS_MSG_SPLIT_BEGIN_PART,
@@ -127,7 +120,7 @@ write_split_wim(WIMStruct *orig_wim, const tchar *swm_name,
                progfunc = orig_wim->progfunc;
                orig_wim->progfunc = NULL;
                ret = write_wim_part(orig_wim,
-                                    swm_name_buf,
+                                    progress.split.part_name,
                                     WIMLIB_ALL_IMAGES,
                                     part_write_flags,
                                     1,