Fix copyright notices

[wimlib] / src / wim.c

diff --git a/src/wim.c b/src/wim.c
index e1698952e0f5c889ca9ff8bbb6449a223ad5d536..38792a59c7b406c114c9f8295cd405a5ad4ba37a 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -3,7 +3,7 @@
  */
 
 /*
  */
 
 /*

- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers

  *
  * wimlib - Library for working with WIM files
  *
  *
  * wimlib - Library for working with WIM files
  *


@@ -233,10 +233,9 @@ int select_wim_image(WIMStruct *w, int image)
                        imd->security_data = NULL;
                        INIT_HLIST_HEAD(&imd->inode_list);
                }
                        imd->security_data = NULL;
                        INIT_HLIST_HEAD(&imd->inode_list);
                }

-               w->current_image = WIMLIB_NO_IMAGE;

        }
        }

-
-       imd = wim_get_current_image_metadata(w);
+       w->current_image = image;
+       imd = &w->image_metadata[image - 1];

        if (imd->root_dentry) {
                ret = 0;
        } else {
        if (imd->root_dentry) {
                ret = 0;
        } else {


@@ -246,9 +245,9 @@ int select_wim_image(WIMStruct *w, int image)
                print_lookup_table_entry(imd->metadata_lte, stdout);
                #endif
                ret = read_metadata_resource(w, imd);
                print_lookup_table_entry(imd->metadata_lte, stdout);
                #endif
                ret = read_metadata_resource(w, imd);

+               if (ret)
+                       w->current_image = WIMLIB_NO_IMAGE;

        }
        }

-       if (ret == 0)
-               w->current_image = image;

        return ret;
 }
 
        return ret;
 }