Improve random number generation

[wimlib] / include / wimlib / xml.h

diff --git a/include/wimlib/xml.h b/include/wimlib/xml.h
index 0f0d36834f8279921d0185ce9f52ee6a058b07dd..9ce52104093ea646686775448733672f43794613 100644 (file)
--- a/include/wimlib/xml.h
+++ b/include/wimlib/xml.h
@@ -3,74 +3,85 @@
 
 #include "wimlib/types.h"
 
-struct image_info;
-struct resource_entry;
-
-/* A struct wim_info structure corresponds to the entire XML data for a WIM file. */
-struct wim_info {
-       u64 total_bytes;
-       int num_images;
-       /* Array of `struct image_info's, one for each image in the WIM that is
-        * mentioned in the XML data. */
-       struct image_info *images;
-};
-
-/* xml.c */
-extern int
-xml_export_image(const struct wim_info *old_wim_info, int image,
-                struct wim_info **new_wim_info_p,
-                const tchar *dest_image_name,
-                const tchar *dest_image_description);
+/*****************************************************************************/
+
+struct wim_xml_info;
 
-extern size_t
-xml_get_max_image_name_len(const WIMStruct *wim);
+extern struct wim_xml_info *
+xml_new_info_struct(void);
 
 extern void
+xml_free_info_struct(struct wim_xml_info *info);
+
+/*****************************************************************************/
+
+extern int
+xml_get_image_count(const struct wim_xml_info *info);
+
+extern u64
+xml_get_total_bytes(const struct wim_xml_info *info);
+
+extern u64
+xml_get_image_total_bytes(const struct wim_xml_info *info, int image);
+
+extern u64
+xml_get_image_hard_link_bytes(const struct wim_xml_info *info, int image);
+
+extern bool
+xml_get_wimboot(const struct wim_xml_info *info, int image);
+
+extern u64
+xml_get_windows_build_number(const struct wim_xml_info *info, int image);
+
+extern int
+xml_set_wimboot(struct wim_xml_info *info, int image);
+
+/*****************************************************************************/
+
+extern int
 xml_update_image_info(WIMStruct *wim, int image);
 
-extern void
-xml_delete_image(struct wim_info **wim_info_p, int image);
+extern int
+xml_add_image(struct wim_xml_info *info, const tchar *name);
 
 extern int
-xml_add_image(WIMStruct *wim, const tchar *name);
+xml_export_image(const struct wim_xml_info *src_info, int src_image,
+                struct wim_xml_info *dest_info, const tchar *dest_image_name,
+                const tchar *dest_image_description, bool wimboot);
 
 extern void
-free_wim_info(struct wim_info *info);
+xml_delete_image(struct wim_xml_info *info, int image);
+
 
 extern void
-print_image_info(const struct wim_info *wim_info, int image);
+xml_print_image_info(struct wim_xml_info *info, int image);
+
+/*****************************************************************************/
+
+struct wim_reshdr;
+
+#define WIM_TOTALBYTES_USE_EXISTING  ((u64)(-1))
+#define WIM_TOTALBYTES_OMIT          ((u64)(-2))
 
 extern int
-read_xml_data(int in_fd, const struct resource_entry *res,
-             struct wim_info **info_ret);
+read_wim_xml_data(WIMStruct *wim);
 
 extern int
-write_xml_data(const struct wim_info *wim_info, int image, int out_fd,
-              u64 total_bytes, struct resource_entry *out_res_entry);
+write_wim_xml_data(WIMStruct *wim, int image,
+                  u64 total_bytes, struct wim_reshdr *out_reshdr,
+                  int write_resource_flags);
 
-extern void
-libxml_global_init(void);
+/*****************************************************************************/
 
 extern void
-libxml_global_cleanup(void);
-
-static inline u64
-wim_info_get_total_bytes(const struct wim_info *info)
-{
-       return info->total_bytes;
-}
+xml_global_init(void);
 
-static inline unsigned
-wim_info_get_num_images(const struct wim_info *info)
-{
-       return info->num_images;
-}
+extern void
+xml_global_cleanup(void);
 
-#ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR
 extern void
 xml_set_memory_allocator(void *(*malloc_func)(size_t),
                         void (*free_func)(void *),
                         void *(*realloc_func)(void *, size_t));
-#endif
 
-#endif
+#endif /* _WIMLIB_XML_H */