security.c: Rewrite some code

[wimlib] / src / add_image.c

diff --git a/src/add_image.c b/src/add_image.c
index 263c2e757330ecb5931a19a98763a1d21cf5d79b..caffafebd23de4935cd2bd4d84591b8dc1cc779e 100644 (file)
--- a/src/add_image.c
+++ b/src/add_image.c
@@ -21,9 +21,16 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "wimlib_internal.h"
-#include "lookup_table.h"
-#include "xml.h"
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "wimlib.h"
+#include "wimlib/capture.h"
+#include "wimlib/error.h"
+#include "wimlib/lookup_table.h"
+#include "wimlib/metadata.h"
+#include "wimlib/xml.h"
 
 /*
  * Adds the dentry tree and security data for a new image to the image metadata
@@ -113,7 +120,7 @@ out_put_image_metadata:
                           wim->lookup_table);
        goto out;
 out_free_security_data:
-       free_security_data(sd);
+       free_wim_security_data(sd);
 out:
        return ret;
 }
@@ -177,7 +184,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, 
+       ret = wimlib_update_image(wim, wim->hdr.image_count, add_cmds,
                                  num_sources, 0, progress_func);
        FREE(add_cmds);
        if (ret)