Various fixes

[wimlib] / src / wimlib_internal.h

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index c04ffb1aee312f47fc42ce518094840a17434875..b33f728f0c58b540b3f6b1ab1b6c22e0383e2231 100644 (file)
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -31,10 +31,6 @@
 
 struct stat;
 
-#ifndef WIM_HASH_SIZE
-#define WIM_HASH_SIZE  20
-#endif
-
 #define WIM_MAGIC_LEN  8
 #define WIM_GID_LEN    16
 #define WIM_UNUSED_LEN 60
@@ -206,7 +202,7 @@ struct wim_security_data {
        /* keep track of how many WIMs reference this security data (used when
         * exporting images between WIMs) */
        u32 refcnt;
-} WIMSecurityData;
+};
 
 struct link_group_table;
 
@@ -219,13 +215,13 @@ struct image_metadata {
        /* Pointer to the security data for the image. */
        struct wim_security_data *security_data;
 
+       /* Hard link group table */
+       struct link_group_table *lgt;
+
        /* A pointer to the lookup table entry for this image's metadata
         * resource. */
        struct lookup_table_entry *metadata_lte;
 
-       /* Hard link group table */
-       struct link_group_table *lgt;
-
        /* True if the filesystem of the image has been modified.  If this is
         * the case, the memory for the filesystem is not freed when switching
         * to a different WIM image. */
@@ -312,17 +308,11 @@ static inline struct image_metadata *wim_get_current_image_metadata(WIMStruct *w
        return &w->image_metadata[w->current_image - 1];
 }
 
-/* Prints a hash code field. */
-static inline void print_hash(const u8 hash[])
-{
-       print_byte_field(hash, WIM_HASH_SIZE);
-}
-
 /* hardlink.c */
 
 struct link_group_table *new_link_group_table(u64 capacity);
 int link_group_table_insert(struct dentry *dentry,
-                           struct link_group_table *table);
+                           void *__table);
 void free_link_group_table(struct link_group_table *table);
 u64 assign_link_groups(struct link_group_table *table);
 int link_groups_free_duplicate_data(struct link_group_table *table);
@@ -404,7 +394,8 @@ extern void *make_symlink_reparse_data_buf(const char *symlink_target,
                                           size_t *len_ret);
 extern int dentry_set_symlink(struct dentry *dentry,
                              const char *target,
-                             struct lookup_table *lookup_table);
+                             struct lookup_table *lookup_table,
+                             struct lookup_table_entry **lte_ret);
 
 /* wim.c */
 extern WIMStruct *new_wim_struct();