From: Nick Bowler <nbowler@draconx.ca>
Date: Sat, 12 Mar 2011 01:55:50 +0000 (-0500)
Subject: uobject: Don't access upkg_file's pkg member.
X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/commitdiff_plain/4d52efa59ae13beb3030e6e9ebdddb4ef8c0a5c8

uobject: Don't access upkg_file's pkg member.

The same information is already stored in the UObject class.  Use that
instead.
---

diff --git a/src/engine/music.c b/src/engine/music.c
index 8c17f9d..4295a66 100644
--- a/src/engine/music.c
+++ b/src/engine/music.c
@@ -138,7 +138,7 @@ static int deserialize(UObject *uo)
 		return -1;
 	pos += 1;
 
-	if (f->pkg->version > 61) {
+	if (uo->pkg->version > 61) {
 		/* Random field #2 */
 		if (buflen - pos < 4)
 			return -1;
diff --git a/src/uobject/uobject.c b/src/uobject/uobject.c
index 4bc1655..6ad6f76 100644
--- a/src/uobject/uobject.c
+++ b/src/uobject/uobject.c
@@ -168,7 +168,7 @@ static int deserialize(UObject *uo)
 			return -1;
 		len = rc;
 
-		name = upkg_get_name(f->pkg, tmp);
+		name = upkg_get_name(uo->pkg, tmp);
 		if (!name) {
 			return -1;
 		} else if (strcmp(name, "None") == 0) {