overwrite_wim_inplace(): cleanup

[wimlib] / src / lookup_table.c

diff --git a/src/lookup_table.c b/src/lookup_table.c
index 4fbcf7e56a3ccea040c19ffae1e466d34b2e86ff..89b57b4e65ee757dc0485c61903750b866319091 100644 (file)
--- a/src/lookup_table.c
+++ b/src/lookup_table.c
@@ -667,6 +667,7 @@ print_lookup_table_entry(const struct wim_lookup_table_entry *lte, FILE *out)
                break;
 #ifdef __WIN32__
        case RESOURCE_WIN32:
                break;
 #ifdef __WIN32__
        case RESOURCE_WIN32:

+       case RESOURCE_WIN32_ENCRYPTED:

 #endif
        case RESOURCE_IN_FILE_ON_DISK:
                tfprintf(out, T("File on Disk      = `%"TS"'\n"),
 #endif
        case RESOURCE_IN_FILE_ON_DISK:
                tfprintf(out, T("File on Disk      = `%"TS"'\n"),


@@ -914,6 +915,19 @@ retrieve_lte_pointer(struct wim_lookup_table_entry *lte)
        return NULL;
 }
 
        return NULL;
 }
 

+/* Calculate the SHA1 message digest of a stream and move it from the list of
+ * unhashed streams to the stream lookup table, possibly joining it with an
+ * existing lookup table entry for an identical stream.
+ *
+ * @lte:  An unhashed lookup table entry.
+ * @lookup_table:  Lookup table for the WIM.
+ * @lte_ret:  On success, write a pointer to the resulting lookup table
+ *            entry to this location.  This will be the same as @lte
+ *            if it was inserted into the lookup table, or different if
+ *            a duplicate stream was found.
+ *
+ * Returns 0 on success; nonzero if there is an error reading the stream.
+ */

 int
 hash_unhashed_stream(struct wim_lookup_table_entry *lte,
                     struct wim_lookup_table *lookup_table,
 int
 hash_unhashed_stream(struct wim_lookup_table_entry *lte,
                     struct wim_lookup_table *lookup_table,


@@ -952,9 +966,7 @@ hash_unhashed_stream(struct wim_lookup_table_entry *lte,
                /* No duplicate stream, so we need to insert
                 * this stream into the lookup table and treat
                 * it as a hashed stream. */
                /* No duplicate stream, so we need to insert
                 * this stream into the lookup table and treat
                 * it as a hashed stream. */

-               list_del(&lte->unhashed_list);

                lookup_table_insert(lookup_table, lte);
                lookup_table_insert(lookup_table, lte);

-               lte->out_refcnt = lte->refcnt;

                lte->unhashed = 0;
        }
        if (lte_ret)
                lte->unhashed = 0;
        }
        if (lte_ret)