X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/101802f109713394c6c8e0daea8129c6ee3c60d0..b9bd6403d8188647182e6069b774c34d56e0b4ec:/src/libupkg.c

diff --git a/src/libupkg.c b/src/libupkg.c
index 680faac..178e235 100644
--- a/src/libupkg.c
+++ b/src/libupkg.c
@@ -1,6 +1,6 @@
 /*
  *  upkg: tool for manipulating Unreal Tournament packages.
- *  Copyright (C) 2009 Nick Bowler
+ *  Copyright © 2009-2011 Nick Bowler
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -46,7 +46,7 @@ struct upkg_name {
 struct upkg_export_priv {
 	struct upkg_export pub;
 
-	long package, class, super;
+	long class, super;
 	unsigned long size, offset;
 };
 
@@ -301,7 +301,7 @@ static int pkg_init_exports(struct upkg_priv *pkg)
 		len += rc;
 
 		if (nbuf-len < 4) goto err;
-		export->package = unpack_s32_le(buf+len);
+		export->pub.package = unpack_s32_le(buf+len);
 		len += 4;
 
 		rc = upkg_decode_index(&tmp, buf+len, nbuf-len);
@@ -504,8 +504,9 @@ long upkg_export_find(struct upkg *pub, long parent, const char *name)
 		struct upkg_export_priv *e = &pkg->exports[i];
 
 		/* Assertion: an object's package is an export. */
-		format_assert(e->package >= 0, continue);
-		if (e->package == package && strcmp(e->pub.name, name) == 0) {
+		format_assert(e->pub.package >= 0, continue);
+		if (e->pub.package == package
+		    && strcmp(e->pub.name, name) == 0) {
 			return i;
 		}
 	}