From: Nick Bowler <nbowler@draconx.ca>
Date: Mon, 13 Jul 2009 00:11:12 +0000 (-0400)
Subject: libupkg: Remove the group stuff from upkg_export_class.
X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/commitdiff_plain/bc5c414abd86bb2eb06a5f48ad93d953b99cc020

libupkg: Remove the group stuff from upkg_export_class.
---

diff --git a/src/libupkg.c b/src/libupkg.c
index d5203b4..6012f09 100644
--- a/src/libupkg.c
+++ b/src/libupkg.c
@@ -444,7 +444,7 @@ const char *upkg_export_name(struct upkg *pkg, unsigned long idx)
 }
 
 const char *upkg_export_class(struct upkg *pkg, unsigned long idx,
-                              const char **package, const char **group)
+                              const char **package)
 {
 	struct upkg_export *export;
 	struct upkg_import *iclass, *ipackage;
@@ -461,27 +461,6 @@ const char *upkg_export_class(struct upkg *pkg, unsigned long idx,
 		return NULL;
 	}
 
-	/* ASSUMPTION: group references are always exports */
-	if (export->package < 0) {
-		fprintf(stderr, "Assumption Violated: group not export\n");
-		return NULL;
-	}
-
-	/* Get the group name. */
-	if (export->package > 0) {
-		pkg_idx = export->package - 1;
-
-		if (pkg_idx >= pkg->export_count) {
-			return NULL;
-		}
-
-		/* Lots more to handle.  Function arguments are stupid. */
-
-		if (group) *group = pkg->priv->exports[pkg_idx].name;
-	} else {
-		if (group) *group = NULL;
-	}
-
 	/* Get the class. */
 	if (export->class == 0) {
 		if (package) *package = "Core";
diff --git a/src/upkg.c b/src/upkg.c
index 62f9936..e104cc9 100644
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -110,17 +110,15 @@ void print_guid(unsigned char guid[static 16])
 void print_upkg_exports(struct upkg *pkg)
 {
 	for (unsigned i = 0; i < pkg->export_count; i++) {
-		const char *name, *package, *group, *class;
+		const char *name, *package, *class;
 
 		name  = upkg_export_name(pkg, i);
-		class = upkg_export_class(pkg, i, &package, &group);
+		class = upkg_export_class(pkg, i, &package);
 
 		if (!name || !class)
 			continue;
 
-		printf("%u - %s%s%s (%s.%s)\n", i+1,
-			group ? group : "", group ? "." : "", name,
-			package, class);
+		printf("%u - %s (%s.%s)\n", i+1, name, package, class);
 	}
 }
 
diff --git a/src/upkg.h b/src/upkg.h
index 08ee13a..775f918 100644
--- a/src/upkg.h
+++ b/src/upkg.h
@@ -69,7 +69,7 @@ const char *upkg_get_name(struct upkg *pkg, unsigned long idx);
 long   upkg_export_find(struct upkg *pkg, const char *name);
 const char *upkg_export_name(struct upkg *pkg, unsigned long idx);
 const char *upkg_export_class(struct upkg *pkg, unsigned long idx,
-                              const char **package, const char **group);
+                              const char **package);
 
 struct upkg_file *upkg_export_open(struct upkg *pkg, unsigned long idx);
 size_t upkg_export_read(struct upkg_file *f, void *buf, size_t n);