X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fadd_image.c;h=0aed1deb3a11d5ce2bd868783b641f32f8672742;hb=dc6e67199967519c2e8ce9125b4a6975da85d258;hp=a544c7b8d6ca032449b1ab24b2b85d17ebbc05ef;hpb=628a82db5632db50d44320af2ed9662f47bd5d28;p=wimlib diff --git a/src/add_image.c b/src/add_image.c index a544c7b8..0aed1deb 100644 --- a/src/add_image.c +++ b/src/add_image.c @@ -5,20 +5,18 @@ /* * Copyright (C) 2012, 2013, 2014 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 @@ -90,10 +88,6 @@ wimlib_add_empty_image(WIMStruct *wim, const tchar *name, int *new_idx_ret) { int ret; - ret = can_modify_wim(wim); - if (ret) - return ret; - if (!name) name = T(""); @@ -157,8 +151,7 @@ wimlib_add_image_multisource(WIMStruct *wim, size_t num_sources, const tchar *name, const tchar *config_file, - int add_flags, - wimlib_progress_func_t progress_func) + int add_flags) { int ret; struct wimlib_update_command *add_cmds; @@ -182,7 +175,7 @@ wimlib_add_image_multisource(WIMStruct *wim, /* Delegate the work to wimlib_update_image(). */ ret = wimlib_update_image(wim, wim->hdr.image_count, add_cmds, - num_sources, 0, progress_func); + num_sources, 0); FREE(add_cmds); if (ret) goto out_delete_image; @@ -215,8 +208,7 @@ wimlib_add_image(WIMStruct *wim, const tchar *source, const tchar *name, const tchar *config_file, - int add_flags, - wimlib_progress_func_t progress_func) + int add_flags) { /* Use the more general wimlib_add_image_multisource(). */ const struct wimlib_capture_source capture_src = { @@ -225,6 +217,5 @@ wimlib_add_image(WIMStruct *wim, .reserved = 0, }; return wimlib_add_image_multisource(wim, &capture_src, 1, name, - config_file, add_flags, - progress_func); + config_file, add_flags); }