From: Eric Biggers <ebiggers3@gmail.com>
Date: Sat, 22 Nov 2014 03:40:05 +0000 (-0600)
Subject: Remove unused 'wim' argument to read_metadata_resource()
X-Git-Tag: v1.7.4~48
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=69f07a55f05919a15ff1ec77b963b48f5f6a5d04

Remove unused 'wim' argument to read_metadata_resource()
---

diff --git a/include/wimlib/resource.h b/include/wimlib/resource.h
index dfb2d0f4..42a2edcc 100644
--- a/include/wimlib/resource.h
+++ b/include/wimlib/resource.h
@@ -306,8 +306,7 @@ sha1_stream(struct wim_lookup_table_entry *lte);
 /* Functions to read/write metadata resources.  */
 
 extern int
-read_metadata_resource(WIMStruct *wim,
-		       struct wim_image_metadata *image_metadata);
+read_metadata_resource(struct wim_image_metadata *imd);
 
 extern int
 write_metadata_resource(WIMStruct *wim, int image, int write_resource_flags);
diff --git a/src/extract.c b/src/extract.c
index b0df25d0..39899c40 100644
--- a/src/extract.c
+++ b/src/extract.c
@@ -2017,7 +2017,7 @@ wimlib_extract_image_from_pipe_with_progress(int pipe_fd,
 		if (i == image) {
 			/* Metadata resource is for the image being extracted.
 			 * Parse it and save the metadata in memory.  */
-			ret = read_metadata_resource(pwm, imd);
+			ret = read_metadata_resource(imd);
 			if (ret)
 				goto out_wimlib_free;
 			imd->modified = 1;
diff --git a/src/metadata_resource.c b/src/metadata_resource.c
index 7c97b3df..54730598 100644
--- a/src/metadata_resource.c
+++ b/src/metadata_resource.c
@@ -34,9 +34,6 @@
 /*
  * Reads and parses a metadata resource for an image in the WIM file.
  *
- * @wim:
- *	Pointer to the WIMStruct for the WIM file.
- *
  * @imd:
  *	Pointer to the image metadata structure for the image whose metadata
  *	resource we are reading.  Its `metadata_lte' member specifies the lookup
@@ -52,7 +49,7 @@
  *	WIMLIB_ERR_DECOMPRESSION
  */
 int
-read_metadata_resource(WIMStruct *wim, struct wim_image_metadata *imd)
+read_metadata_resource(struct wim_image_metadata *imd)
 {
 	const struct wim_lookup_table_entry *metadata_lte;
 	void *buf;
diff --git a/src/wim.c b/src/wim.c
index 7b1347dd..8422d9e1 100644
--- a/src/wim.c
+++ b/src/wim.c
@@ -355,7 +355,7 @@ select_wim_image(WIMStruct *wim, int image)
 	if (imd->root_dentry || imd->modified) {
 		ret = 0;
 	} else {
-		ret = read_metadata_resource(wim, imd);
+		ret = read_metadata_resource(imd);
 		if (ret)
 			wim->current_image = WIMLIB_NO_IMAGE;
 	}