From 799b86d9a6db3b581caa895fc786f6a38286fa0f Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 20 Aug 2013 23:35:25 -0500 Subject: [PATCH 1/1] Fix programs not compiled by default --- examples/applywim.c | 3 +-- programs/wimapply.c | 3 +-- tests/multi-mount/multi-mount.c | 17 +++++++++-------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/examples/applywim.c b/examples/applywim.c index ba62a957..6d34a432 100644 --- a/examples/applywim.c +++ b/examples/applywim.c @@ -28,8 +28,7 @@ int main(int argc, char **argv) goto out_wimlib_global_cleanup; /* Extract all the images. */ - ret = wimlib_extract_image(wim, WIMLIB_ALL_IMAGES, argv[2], 0, - NULL, 0, NULL); + ret = wimlib_extract_image(wim, WIMLIB_ALL_IMAGES, argv[2], 0, NULL); /* Free the WIM file */ wimlib_free(wim); diff --git a/programs/wimapply.c b/programs/wimapply.c index 8de4a54d..cd7edde4 100644 --- a/programs/wimapply.c +++ b/programs/wimapply.c @@ -75,8 +75,7 @@ int main(int argc, char **argv) return ret; } - ret = wimlib_extract_image(w, image, target, extract_flags, - NULL, 0, NULL); + ret = wimlib_extract_image(w, image, target, extract_flags, NULL); if (ret != 0) { fputs("Failed to apply WIM image\n", stderr); fprintf(stderr, "Error code: %s\n", wimlib_get_error_string(ret)); diff --git a/tests/multi-mount/multi-mount.c b/tests/multi-mount/multi-mount.c index 8b932860..b6c5ff76 100644 --- a/tests/multi-mount/multi-mount.c +++ b/tests/multi-mount/multi-mount.c @@ -9,22 +9,23 @@ int main(int argc, char **argv) WIMStruct *w2; assert(argc == 5); - ret = wimlib_open_wim(argv[1], 0, &w1); + ret = wimlib_open_wim(argv[1], 0, &w1, NULL); assert(ret == 0); - ret = wimlib_open_wim(argv[2], 0, &w2); + ret = wimlib_open_wim(argv[2], 0, &w2, NULL); assert(ret == 0); #pragma omp parallel num_threads(2) { int ret; assert(omp_get_num_threads() == 2); - if (omp_get_thread_num() == 0) - ret = wimlib_mount(w1, 1, argv[3], - WIMLIB_MOUNT_FLAG_DEBUG, NULL, 0); - else - ret = wimlib_mount(w2, 1, argv[4], - WIMLIB_MOUNT_FLAG_DEBUG, NULL, 0); + if (omp_get_thread_num() == 0) { + ret = wimlib_mount_image(w1, 1, argv[3], + WIMLIB_MOUNT_FLAG_DEBUG, NULL); + } else { + ret = wimlib_mount_image(w2, 1, argv[4], + WIMLIB_MOUNT_FLAG_DEBUG, NULL); + } assert(ret == 0); } return 0; -- 2.43.0