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);
- 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");
}
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)
/*
- * 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
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) {
/* 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) {
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;
*
* @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;
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;
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)
int select_wim_image(WIMStruct *w, int image)
{
- struct image_metadata *imd;
+ struct wim_image_metadata *imd;
DEBUG("Selecting image %d", image);
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",
* 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;
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_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;
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;
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];
/* 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 */
/* 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);