X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Flookup_table.c;h=f22bfaf7cf7df4c995065b81eb0ba10a9af77b65;hb=670a0ed6a1f36bebf71f0b221f3d78e497d305c2;hp=89b57b4e65ee757dc0485c61903750b866319091;hpb=1f2091f5bb860769e20105af2d9eff3a0872c57b;p=wimlib diff --git a/src/lookup_table.c b/src/lookup_table.c index 89b57b4e..f22bfaf7 100644 --- a/src/lookup_table.c +++ b/src/lookup_table.c @@ -89,15 +89,16 @@ clone_lookup_table_entry(const struct wim_lookup_table_entry *old) #ifdef __WIN32__ case RESOURCE_WIN32: case RESOURCE_WIN32_ENCRYPTED: +#else + case RESOURCE_IN_FILE_ON_DISK: #endif #ifdef WITH_FUSE case RESOURCE_IN_STAGING_FILE: -#endif - case RESOURCE_IN_FILE_ON_DISK: BUILD_BUG_ON((void*)&old->file_on_disk != (void*)&old->staging_file_name); - new->staging_file_name = TSTRDUP(old->staging_file_name); - if (!new->staging_file_name) +#endif + new->file_on_disk = TSTRDUP(old->file_on_disk); + if (!new->file_on_disk) goto out_free; break; case RESOURCE_IN_ATTACHED_BUFFER: @@ -144,14 +145,18 @@ free_lookup_table_entry(struct wim_lookup_table_entry *lte) { if (lte) { switch (lte->resource_location) { - case RESOURCE_IN_STAGING_FILE: - case RESOURCE_IN_ATTACHED_BUFFER: - case RESOURCE_IN_FILE_ON_DISK: -#ifdef __WIN32__ + #ifdef __WIN32__ case RESOURCE_WIN32: -#endif + case RESOURCE_WIN32_ENCRYPTED: + #else + case RESOURCE_IN_FILE_ON_DISK: + #endif + #ifdef WITH_FUSE + case RESOURCE_IN_STAGING_FILE: BUILD_BUG_ON((void*)<e->file_on_disk != (void*)<e->staging_file_name); + #endif + case RESOURCE_IN_ATTACHED_BUFFER: BUILD_BUG_ON((void*)<e->file_on_disk != (void*)<e->attached_buffer); FREE(lte->file_on_disk); @@ -668,15 +673,18 @@ print_lookup_table_entry(const struct wim_lookup_table_entry *lte, FILE *out) #ifdef __WIN32__ case RESOURCE_WIN32: case RESOURCE_WIN32_ENCRYPTED: -#endif +#else case RESOURCE_IN_FILE_ON_DISK: +#endif tfprintf(out, T("File on Disk = `%"TS"'\n"), lte->file_on_disk); break; +#ifdef WITH_FUSE case RESOURCE_IN_STAGING_FILE: tfprintf(out, T("Staging File = `%"TS"'\n"), lte->staging_file_name); break; +#endif default: break; }