Remove unused 'wim' argument to read_metadata_resource()
authorEric Biggers <ebiggers3@gmail.com>
Sat, 22 Nov 2014 03:40:05 +0000 (21:40 -0600)
committerEric Biggers <ebiggers3@gmail.com>
Sat, 22 Nov 2014 03:40:05 +0000 (21:40 -0600)
include/wimlib/resource.h
src/extract.c
src/metadata_resource.c
src/wim.c

index dfb2d0f..42a2edc 100644 (file)
@@ -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);
index b0df25d..39899c4 100644 (file)
@@ -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;
index 7c97b3d..5473059 100644 (file)
@@ -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;
index 7b1347d..8422d9e 100644 (file)
--- 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;
        }