X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fsplit.c;h=4df258ac97af06f8e6eed59e0881e1224c2316c9;hb=7251c7d0afac3b738dda1c4f45e6d3d3090f2622;hp=d1317cf9d44f0ce82b810e65b1f53f28852d43c7;hpb=668c363a59c521f48eecbc4dd549c07a3e36179e;p=wimlib

diff --git a/src/split.c b/src/split.c
index d1317cf9..4df258ac 100644
--- 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
@@ -32,6 +30,7 @@
 #include "wimlib/list.h"
 #include "wimlib/lookup_table.h"
 #include "wimlib/metadata.h"
+#include "wimlib/progress.h"
 #include "wimlib/resource.h"
 #include "wimlib/wim.h"
 #include "wimlib/write.h"
@@ -64,8 +63,7 @@ struct swm_info {
 
 static int
 write_split_wim(WIMStruct *orig_wim, const tchar *swm_name,
-		struct swm_info *swm_info, int write_flags,
-		wimlib_progress_func_t progress_func)
+		struct swm_info *swm_info, int write_flags)
 {
 	size_t swm_name_len;
 	tchar *swm_name_buf;
@@ -97,12 +95,12 @@ 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);
 
 	for (part_number = 1; part_number <= swm_info->num_parts; part_number++) {
 		int part_write_flags;
+		wimlib_progress_func_t progfunc;
 
 		if (part_number != 1) {
 			tsprintf(swm_name_buf + swm_base_name_len,
@@ -110,34 +108,43 @@ write_split_wim(WIMStruct *orig_wim, const tchar *swm_name,
 		}
 
 		progress.split.cur_part_number = part_number;
-		if (progress_func) {
-			progress_func(WIMLIB_PROGRESS_MSG_SPLIT_BEGIN_PART,
-				      &progress);
-		}
+		progress.split.part_name = swm_name_buf;
+
+		ret = call_progress(orig_wim->progfunc,
+				    WIMLIB_PROGRESS_MSG_SPLIT_BEGIN_PART,
+				    &progress,
+				    orig_wim->progctx);
+		if (ret)
+			return ret;
 
 		part_write_flags = write_flags;
 		part_write_flags |= WIMLIB_WRITE_FLAG_USE_EXISTING_TOTALBYTES;
 		if (part_number != 1)
 			part_write_flags |= WIMLIB_WRITE_FLAG_NO_METADATA;
 
+		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,
-				     NULL,
 				     part_number,
 				     swm_info->num_parts,
 				     &swm_info->parts[part_number - 1].stream_list,
 				     guid);
+		orig_wim->progfunc = progfunc;
 		if (ret)
 			return ret;
 
 		progress.split.completed_bytes += swm_info->parts[part_number - 1].size;
-		if (progress_func) {
-			progress_func(WIMLIB_PROGRESS_MSG_SPLIT_END_PART,
-				      &progress);
-		}
+
+		ret = call_progress(orig_wim->progfunc,
+				    WIMLIB_PROGRESS_MSG_SPLIT_END_PART,
+				    &progress,
+				    orig_wim->progctx);
+		if (ret)
+			return ret;
 	}
 	return 0;
 }
@@ -201,8 +208,7 @@ add_stream_to_swm(struct wim_lookup_table_entry *lte, void *_swm_info)
 /* API function documented in wimlib.h  */
 WIMLIBAPI int
 wimlib_split(WIMStruct *wim, const tchar *swm_name,
-	     u64 part_size, int write_flags,
-	     wimlib_progress_func_t progress_func)
+	     u64 part_size, int write_flags)
 {
 	struct swm_info swm_info;
 	unsigned i;
@@ -233,8 +239,7 @@ wimlib_split(WIMStruct *wim, const tchar *swm_name,
 	if (ret)
 		goto out_free_swm_info;
 
-	ret = write_split_wim(wim, swm_name, &swm_info, write_flags,
-			      progress_func);
+	ret = write_split_wim(wim, swm_name, &swm_info, write_flags);
 out_free_swm_info:
 	FREE(swm_info.parts);
 	return ret;