Rename image_metadata to wim_image_metadata

diff --git a/src/add_image.c b/src/add_image.c
index 4fc6c4a6cd0f3a778e7436110aac65a3152dfc4d..62fbdfb3141bc2647696117fcb26ada96efb4a69 100644 (file)
--- a/src/add_image.c
+++ b/src/add_image.c
@@ -46,14 +46,14 @@ int add_new_dentry_tree(WIMStruct *w, struct wim_dentry *root_dentry,
                        struct wim_security_data *sd)
 {
        struct wim_lookup_table_entry *metadata_lte;
                        struct wim_security_data *sd)
 {
        struct wim_lookup_table_entry *metadata_lte;

-       struct image_metadata *imd;
-       struct image_metadata *new_imd;
+       struct wim_image_metadata *imd;
+       struct wim_image_metadata *new_imd;

 
        wimlib_assert(root_dentry != NULL);
 
        DEBUG("Reallocating image metadata array for image_count = %u",
              w->hdr.image_count + 1);
 
        wimlib_assert(root_dentry != NULL);
 
        DEBUG("Reallocating image metadata array for image_count = %u",
              w->hdr.image_count + 1);

-       imd = CALLOC((w->hdr.image_count + 1), sizeof(struct image_metadata));
+       imd = CALLOC((w->hdr.image_count + 1), sizeof(struct wim_image_metadata));

 
        if (!imd) {
                ERROR("Failed to allocate memory for new image metadata array");
 
        if (!imd) {
                ERROR("Failed to allocate memory for new image metadata array");


@@ -61,7 +61,7 @@ int add_new_dentry_tree(WIMStruct *w, struct wim_dentry *root_dentry,
        }
 
        memcpy(imd, w->image_metadata,
        }
 
        memcpy(imd, w->image_metadata,

-              w->hdr.image_count * sizeof(struct image_metadata));
+              w->hdr.image_count * sizeof(struct wim_image_metadata));

 
        metadata_lte = new_lookup_table_entry();
        if (!metadata_lte)
 
        metadata_lte = new_lookup_table_entry();
        if (!metadata_lte)


@@ -91,8 +91,9 @@ err:
 
 
 /*
 
 
 /*

- * build_dentry_tree: - Recursively builds a tree of `struct wim_dentry tree
- *                     from an on-disk directory tree.
+ * build_dentry_tree():
+ *     Recursively builds a tree of WIM dentries from an on-disk directory
+ *     tree.

  *
  * @root_ret:   Place to return a pointer to the root of the dentry tree.  Only
  *             modified if successful.  Set to NULL if the file or directory was
  *
  * @root_ret:   Place to return a pointer to the root of the dentry tree.  Only
  *             modified if successful.  Set to NULL if the file or directory was


@@ -629,7 +630,7 @@ WIMLIBAPI int wimlib_add_image(WIMStruct *w, const char *source,
        struct wim_dentry *root_dentry = NULL;
        struct wim_security_data *sd;
        struct capture_config config;
        struct wim_dentry *root_dentry = NULL;
        struct wim_security_data *sd;
        struct capture_config config;

-       struct image_metadata *imd;
+       struct wim_image_metadata *imd;

        int ret;
 
        if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NTFS) {
        int ret;
 
        if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NTFS) {

diff --git a/src/delete_image.c b/src/delete_image.c
index 7d5e92b7d1188b2ea8998c0cc7492165d8d5e868..0753949034cedf30e2c7348fbada327323ed8b38 100644 (file)
--- a/src/delete_image.c
+++ b/src/delete_image.c
@@ -68,7 +68,7 @@ WIMLIBAPI int wimlib_delete_image(WIMStruct *w, int image)
 
        /* Get rid of the empty slot in the image metadata array. */
        memmove(&w->image_metadata[image - 1], &w->image_metadata[image],
 
        /* Get rid of the empty slot in the image metadata array. */
        memmove(&w->image_metadata[image - 1], &w->image_metadata[image],

-               (w->hdr.image_count - image) * sizeof(struct image_metadata));
+               (w->hdr.image_count - image) * sizeof(struct wim_image_metadata));

 
        /* Decrement the image count. */
        if (--w->hdr.image_count == 0) {
 
        /* Decrement the image count. */
        if (--w->hdr.image_count == 0) {

diff --git a/src/export_image.c b/src/export_image.c
index 1cbb52d74d53b573dfaff0cfd345ca0d427785ea..e5b7e42954c727cb8881b8704779678960302bbb 100644 (file)
--- a/src/export_image.c
+++ b/src/export_image.c
@@ -105,7 +105,7 @@ WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim,
        int ret;
        struct wim_security_data *sd;
        struct wim_lookup_table *joined_tab, *src_wim_tab_save;
        int ret;
        struct wim_security_data *sd;
        struct wim_lookup_table *joined_tab, *src_wim_tab_save;

-       struct image_metadata *src_imd;
+       struct wim_image_metadata *src_imd;

        struct hlist_node *cur_node;
        struct list_head lte_list_head;
        struct wim_inode *inode;
        struct hlist_node *cur_node;
        struct list_head lte_list_head;
        struct wim_inode *inode;

diff --git a/src/metadata_resource.c b/src/metadata_resource.c
index db395d2ed9716302f03cf908d3501b60f9c710c0..da3ca5402c976a4f67c434ea6486f3af0ba00cda 100644 (file)
--- a/src/metadata_resource.c
+++ b/src/metadata_resource.c
@@ -42,7 +42,7 @@
  *
  * @return:    Zero on success, nonzero on failure.
  */
  *
  * @return:    Zero on success, nonzero on failure.
  */

-int read_metadata_resource(WIMStruct *w, struct image_metadata *imd)
+int read_metadata_resource(WIMStruct *w, struct wim_image_metadata *imd)

 {
        u8 *buf;
        u32 dentry_offset;
 {
        u8 *buf;
        u32 dentry_offset;

diff --git a/src/mount_image.c b/src/mount_image.c
index 809762231c5335a50cd73051299bfed7781e7188..df8d523bf64aa38732689d78c5e0193d6f6f39dc 100644 (file)
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -2334,7 +2334,7 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
        int ret;
        char *dir_copy;
        struct wim_lookup_table *joined_tab, *wim_tab_save;
        int ret;
        char *dir_copy;
        struct wim_lookup_table *joined_tab, *wim_tab_save;

-       struct image_metadata *imd;
+       struct wim_image_metadata *imd;

        struct wimfs_context ctx;
        struct hlist_node *cur_node;
        struct wim_inode *inode;
        struct wimfs_context ctx;
        struct hlist_node *cur_node;
        struct wim_inode *inode;

diff --git a/src/wim.c b/src/wim.c
index 89b0156c82e1d5365d2cc6b564563c7fed116c47..915e036dd629de15b4f96d1dee7da4f29ab37639 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -107,8 +107,8 @@ int for_image(WIMStruct *w, int image, int (*visitor)(WIMStruct *))
 
 static int sort_image_metadata_by_position(const void *p1, const void *p2)
 {
 
 static int sort_image_metadata_by_position(const void *p1, const void *p2)
 {

-       const struct image_metadata *imd1 = p1;
-       const struct image_metadata *imd2 = p2;
+       const struct wim_image_metadata *imd1 = p1;
+       const struct wim_image_metadata *imd2 = p2;

        u64 offset1 = imd1->metadata_lte->resource_entry.offset;
        u64 offset2 = imd2->metadata_lte->resource_entry.offset;
        if (offset1 < offset2)
        u64 offset1 = imd1->metadata_lte->resource_entry.offset;
        u64 offset2 = imd2->metadata_lte->resource_entry.offset;
        if (offset1 < offset2)


@@ -203,7 +203,7 @@ WIMLIBAPI int wimlib_get_num_images(const WIMStruct *w)
 
 int select_wim_image(WIMStruct *w, int image)
 {
 
 int select_wim_image(WIMStruct *w, int image)
 {

-       struct image_metadata *imd;
+       struct wim_image_metadata *imd;

 
        DEBUG("Selecting image %d", image);
 
 
        DEBUG("Selecting image %d", image);
 


@@ -495,7 +495,7 @@ static int begin_read(WIMStruct *w, const char *in_wim_path, int open_flags,
 
        if (w->hdr.image_count != 0) {
                w->image_metadata = CALLOC(w->hdr.image_count,
 
        if (w->hdr.image_count != 0) {
                w->image_metadata = CALLOC(w->hdr.image_count,

-                                          sizeof(struct image_metadata));
+                                          sizeof(struct wim_image_metadata));

 
                if (!w->image_metadata) {
                        ERROR("Failed to allocate memory for %u image metadata structures",
 
                if (!w->image_metadata) {
                        ERROR("Failed to allocate memory for %u image metadata structures",


@@ -529,7 +529,7 @@ static int begin_read(WIMStruct *w, const char *in_wim_path, int open_flags,
         * file, rather than their order in the lookup table, which is random
         * because of hashing. */
        qsort(w->image_metadata, w->current_image,
         * file, rather than their order in the lookup table, which is random
         * because of hashing. */
        qsort(w->image_metadata, w->current_image,

-             sizeof(struct image_metadata), sort_image_metadata_by_position);
+             sizeof(struct wim_image_metadata), sort_image_metadata_by_position);

 
        w->current_image = WIMLIB_NO_IMAGE;
 
 
        w->current_image = WIMLIB_NO_IMAGE;
 


@@ -579,7 +579,7 @@ WIMLIBAPI int wimlib_open_wim(const char *wim_file, int open_flags,
        return ret;
 }
 
        return ret;
 }
 

-void destroy_image_metadata(struct image_metadata *imd,
+void destroy_image_metadata(struct wim_image_metadata *imd,

                            struct wim_lookup_table *table)
 {
        free_dentry_tree(imd->root_dentry, table);
                            struct wim_lookup_table *table)
 {
        free_dentry_tree(imd->root_dentry, table);

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index 0f65a12d1f59a5ddba047a540bb2ba309b1bcfdd..34cdd72fda079ca9b03fb2d257b6c6675ae73756 100644 (file)
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -242,7 +242,7 @@ struct wim_security_data {
 struct wim_inode_table;
 
 /* Metadata resource for an image. */
 struct wim_inode_table;
 
 /* Metadata resource for an image. */

-struct image_metadata {
+struct wim_image_metadata {

        /* Pointer to the root dentry for the image. */
        struct wim_dentry    *root_dentry;
 
        /* Pointer to the root dentry for the image. */
        struct wim_dentry    *root_dentry;
 


@@ -295,7 +295,7 @@ struct WIMStruct {
        struct wim_info *wim_info;
 
        /* Array of the image metadata, one for each image in the WIM. */
        struct wim_info *wim_info;
 
        /* Array of the image metadata, one for each image in the WIM. */

-       struct image_metadata *image_metadata;
+       struct wim_image_metadata *image_metadata;

 
        /* The header of the WIM file. */
        struct wim_header hdr;
 
        /* The header of the WIM file. */
        struct wim_header hdr;


@@ -338,7 +338,7 @@ wim_const_security_data(const WIMStruct *w)
        return w->image_metadata[w->current_image - 1].security_data;
 }
 
        return w->image_metadata[w->current_image - 1].security_data;
 }
 

-static inline struct image_metadata *
+static inline struct wim_image_metadata *

 wim_get_current_image_metadata(WIMStruct *w)
 {
        return &w->image_metadata[w->current_image - 1];
 wim_get_current_image_metadata(WIMStruct *w)
 {
        return &w->image_metadata[w->current_image - 1];


@@ -417,7 +417,7 @@ extern int new_joined_lookup_table(WIMStruct *w,
 /* metadata_resource.c */
 
 extern int read_metadata_resource(WIMStruct *w,
 /* metadata_resource.c */
 
 extern int read_metadata_resource(WIMStruct *w,

-                                 struct image_metadata *image_metadata);
+                                 struct wim_image_metadata *image_metadata);

 extern int write_metadata_resource(WIMStruct *w);
 
 /* ntfs-apply.c */
 extern int write_metadata_resource(WIMStruct *w);
 
 /* ntfs-apply.c */


@@ -526,7 +526,7 @@ extern int verify_swm_set(WIMStruct *w,
 /* wim.c */
 extern int select_wim_image(WIMStruct *w, int image);
 extern int for_image(WIMStruct *w, int image, int (*visitor)(WIMStruct *));
 /* wim.c */
 extern int select_wim_image(WIMStruct *w, int image);
 extern int for_image(WIMStruct *w, int image, int (*visitor)(WIMStruct *));

-extern void destroy_image_metadata(struct image_metadata *imd,
+extern void destroy_image_metadata(struct wim_image_metadata *imd,

                                   struct wim_lookup_table *lt);
 
 
                                   struct wim_lookup_table *lt);