various: use 'atoms' for certain package field and misc fixes

 - implement a hash table for commonly shared fields such as
   license, version and architecture
 - use macroes to print blobs or pkgname-pkgver strings
 - fix some old cruft

1 files changed, 9 insertions, 6 deletions

diff --git a/src/apk_package.h b/src/apk_package.h
index 8ba1ffe..0b0d317 100644
--- a/src/apk_package.h
+++ b/src/apk_package.h
@@ -63,8 +63,8 @@ struct apk_sign_ctx {
 
 struct apk_dependency {
 	struct apk_name *name;
+	apk_blob_t *version;
 	int result_mask;
-	char *version;
 };
 APK_ARRAY(apk_dependency_array, struct apk_dependency);
 
@@ -83,18 +83,21 @@ struct apk_installed_package {
 
 struct apk_package {
 	apk_hash_node hash_node;
-	unsigned repos;
 	struct apk_name *name;
-	char *version, *arch;
-	char *url, *description, *license;
+	struct apk_installed_package *ipkg;
+	apk_blob_t *version, *arch, *license;
+	char *url, *description;
+	char *filename;
 	struct apk_dependency_array *depends;
 	size_t installed_size, size;
-	char *filename;
+	unsigned repos;
 	struct apk_checksum csum;
-	struct apk_installed_package *ipkg;
 };
 APK_ARRAY(apk_package_array, struct apk_package *);
 
+#define PKG_VER_FMT		"%s-" BLOB_FMT
+#define PKG_VER_PRINTF(pkg)	pkg->name->name, BLOB_PRINTF(*pkg->version)
+
 extern const char *apk_script_types[];
 
 void apk_sign_ctx_init(struct apk_sign_ctx *ctx, int action,