X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwin32_apply.c;h=6f9e41b98393669f8ad42151ecd9407c4c2c6e88;hb=f3c7a16f6cdb32b04ead31581d5461e3f80ed044;hp=b7d506b3b18c77864ba9ed2b92479d935029ec3e;hpb=47fcf3c14dec59bb5338b6e53890ab83c0ad4f2b;p=wimlib

diff --git a/src/win32_apply.c b/src/win32_apply.c
index b7d506b3..6f9e41b9 100644
--- a/src/win32_apply.c
+++ b/src/win32_apply.c
@@ -69,7 +69,7 @@ struct win32_apply_ctx {
 	} wimboot;
 
 	/* External backing information  */
-	struct string_set *prepopulate_pats;
+	struct string_list *prepopulate_pats;
 	void *mem_prepopulate_pats;
 	bool tried_to_load_prepopulate_list;
 
@@ -338,7 +338,7 @@ load_prepopulate_pats(struct win32_apply_ctx *ctx)
 	const struct blob_descriptor *blob;
 	int ret;
 	void *buf;
-	struct string_set *s;
+	struct string_list *strings;
 	void *mem;
 	struct text_file_section sec;
 
@@ -366,14 +366,14 @@ load_prepopulate_pats(struct win32_apply_ctx *ctx)
 	if (ret)
 		return ret;
 
-	s = CALLOC(1, sizeof(struct string_set));
-	if (!s) {
+	strings = CALLOC(1, sizeof(struct string_list));
+	if (!strings) {
 		FREE(buf);
 		return WIMLIB_ERR_NOMEM;
 	}
 
 	sec.name = T("PrepopulateList");
-	sec.strings = s;
+	sec.strings = strings;
 
 	ret = do_load_text_file(path, buf, blob->size, &mem, &sec, 1,
 				LOAD_TEXT_FILE_REMOVE_QUOTES |
@@ -382,10 +382,10 @@ load_prepopulate_pats(struct win32_apply_ctx *ctx)
 	STATIC_ASSERT(OS_PREFERRED_PATH_SEPARATOR == WIM_PATH_SEPARATOR);
 	FREE(buf);
 	if (ret) {
-		FREE(s);
+		FREE(strings);
 		return ret;
 	}
-	ctx->prepopulate_pats = s;
+	ctx->prepopulate_pats = strings;
 	ctx->mem_prepopulate_pats = mem;
 	return 0;
 }
@@ -1129,7 +1129,7 @@ adjust_compression_attribute(HANDLE h, const struct wim_dentry *dentry,
 	status = winnt_fsctl(h, FSCTL_SET_COMPRESSION,
 			     &compression_state, sizeof(USHORT), NULL, 0, NULL);
 	if (NT_SUCCESS(status))
-		return status;
+		return 0;
 
 	winnt_error(status, L"Can't %s compression attribute on \"%ls\"",
 		    (compressed ? "set" : "clear"), current_path(ctx));
@@ -2436,7 +2436,7 @@ static wchar_t *bootloader_pattern_strings[] = {
 	L"\\Windows\\System32\\CodeIntegrity\\driver.stl",
 };
 
-static const struct string_set bootloader_patterns = {
+static const struct string_list bootloader_patterns = {
 	.strings = bootloader_pattern_strings,
 	.num_strings = ARRAY_LEN(bootloader_pattern_strings),
 };