From: Nick Bowler <nbowler@draconx.ca>
Date: Fri, 5 Jun 2009 15:27:08 +0000 (-0400)
Subject: Remove redundant index field from upkg_name and fix some types.
X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/commitdiff_plain/c2a7f0e4301165cbced32cad8095f231b526ba52

Remove redundant index field from upkg_name and fix some types.
---

diff --git a/libupkg.c b/libupkg.c
index b932d86..118e04f 100644
--- a/libupkg.c
+++ b/libupkg.c
@@ -6,7 +6,7 @@
 #include "pack.h"
 
 struct upkg_name {
-	unsigned long index, flags;
+	unsigned long flags;
 	char *name;
 };
 
@@ -19,16 +19,6 @@ struct upkg_private {
 	unsigned char guid[16];
 };
 
-static int namecmp(const void *_a, const void *_b, void *_pkg)
-{
-	const struct upkg_name *a = _a, *b = _b;
-	if (a->index < b->index)
-		return -1;
-	if (a->index > b->index)
-		return -1;
-	return 0;
-}
-
 static long decode_index(unsigned char *bytes)
 {
 	long val = 0;
@@ -73,7 +63,7 @@ static struct upkg *init_upkg(unsigned char hdr[static UPKG_HDR_SIZE])
 
 static int pkg_init_names(struct upkg *pkg)
 {
-	size_t rc, nbuf = 0, len;
+	size_t rc, len, nbuf = 0;
 	unsigned long index = 0;
 	char buf[512];
 
@@ -86,7 +76,6 @@ static int pkg_init_names(struct upkg *pkg)
 
 	while (index < pkg->name_count) {
 		struct upkg_name *name = &pkg->priv->names[index];
-		name->index = index;
 
 		/* Read some data into buffer. */
 		if (!feof(pkg->priv->f)) {
diff --git a/upkg.c b/upkg.c
index 970de56..d7b181d 100644
--- a/upkg.c
+++ b/upkg.c
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
 	printf("Flags:   %lx\n", pkg->flags);
 	print_upkg_flags("\t", pkg->flags);
 
-	printf("Names:   %zu\n", pkg->name_count);
+	printf("Names:   %lu\n", pkg->name_count);
 	for (unsigned long i = 0; i < pkg->name_count; i++) {
 		printf("\t%s\n", upkg_get_name(pkg, i));
 	}