From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 22 Jul 2021 12:39:58 +0000 (+0000)
Subject: archive: Remove archive filename defines
X-Git-Tag: 0.9.28~1023
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dbfb5e12b35642dd6f79d09c7d88798bb1bfa15;p=pakfire.git

archive: Remove archive filename defines

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c
index afa7a5c2b..a240e2152 100644
--- a/src/libpakfire/archive.c
+++ b/src/libpakfire/archive.c
@@ -290,7 +290,7 @@ static struct archive* pakfire_archive_open_payload(struct pakfire_archive* arch
 	struct archive_entry* entry = NULL;
 
 	// Find the payload
-	int r = open_archive_and_find(archive, a, &entry, PAKFIRE_ARCHIVE_FN_PAYLOAD);
+	int r = open_archive_and_find(archive, a, &entry, "data.img");
 	if (r)
 		return NULL;
 
@@ -498,7 +498,7 @@ static int pakfire_archive_parse_metadata(struct pakfire_archive* archive) {
 		return 0;
 
 	// Read the metadata file
-	int r = open_archive_and_read(archive, PAKFIRE_ARCHIVE_FN_METADATA, &data, &size);
+	int r = open_archive_and_read(archive, "info", &data, &size);
 	if (r)
 		return r;
 
diff --git a/src/libpakfire/include/pakfire/archive.h b/src/libpakfire/include/pakfire/archive.h
index 21ee3e6c6..93255a547 100644
--- a/src/libpakfire/include/pakfire/archive.h
+++ b/src/libpakfire/include/pakfire/archive.h
@@ -68,13 +68,6 @@ size_t pakfire_archive_get_size(struct pakfire_archive* archive);
 struct pakfire_package* pakfire_archive_make_package(
 	struct pakfire_archive* archive, struct pakfire_repo* repo);
 
-#define PAKFIRE_ARCHIVE_FN_CHECKSUMS		"chksums"
-#define PAKFIRE_ARCHIVE_FN_FILELIST			"filelist"
-#define PAKFIRE_ARCHIVE_FN_FORMAT			"pakfire-format"
-#define PAKFIRE_ARCHIVE_FN_METADATA			"info"
-#define PAKFIRE_ARCHIVE_FN_PAYLOAD			"data.img"
-#define PAKFIRE_ARCHIVE_FN_SIGNATURES		"signatures"
-
 #ifdef PAKFIRE_PRIVATE
 
 struct pakfire_scriptlet* pakfire_archive_get_scriptlet(
diff --git a/src/libpakfire/packager.c b/src/libpakfire/packager.c
index 90fba2c31..6553549d7 100644
--- a/src/libpakfire/packager.c
+++ b/src/libpakfire/packager.c
@@ -444,7 +444,7 @@ static int pakfire_packager_write_format(struct pakfire_packager* packager,
 	DEBUG(packager->pakfire, "Writing package format\n");
 
 	int r = pakfire_packager_write_file_from_buffer(packager, a, NULL,
-		PAKFIRE_ARCHIVE_FN_FORMAT, 0444, buffer);
+		"pakfire-format", 0444, buffer);
 	if (r)
 		return r;
 
@@ -663,7 +663,7 @@ static int pakfire_packager_write_metadata(struct pakfire_packager* packager,
 
 	// Write buffer
 	int r = pakfire_packager_write_file_from_buffer(packager, a, mtree,
-		PAKFIRE_ARCHIVE_FN_METADATA, 0444, buffer);
+		"info", 0444, buffer);
 
 	free(buffer);
 
@@ -845,7 +845,7 @@ int pakfire_packager_finish(struct pakfire_packager* packager, FILE* f) {
 	}
 
 	// Write the filelist in mtree format
-	r = pakfire_packager_write_archive(packager, a, mtree, PAKFIRE_ARCHIVE_FN_FILELIST,
+	r = pakfire_packager_write_archive(packager, a, mtree, "filelist",
 		&packager->mtree, packager->fmtree);
 	if (r) {
 		ERROR(packager->pakfire, "Could not add filelist to archive: %s\n",
@@ -854,7 +854,7 @@ int pakfire_packager_finish(struct pakfire_packager* packager, FILE* f) {
 	}
 
 	// Write the payload
-	r = pakfire_packager_write_archive(packager, a, mtree, PAKFIRE_ARCHIVE_FN_PAYLOAD,
+	r = pakfire_packager_write_archive(packager, a, mtree, "data.img",
 		&packager->payload, packager->fpayload);
 	if (r) {
 		ERROR(packager->pakfire, "Could not add payload to archive: %s\n",
@@ -880,8 +880,7 @@ int pakfire_packager_finish(struct pakfire_packager* packager, FILE* f) {
 	}
 
 	// Write checksums
-	r = pakfire_packager_write_archive(packager, a, NULL, PAKFIRE_ARCHIVE_FN_CHECKSUMS,
-		&mtree, fmtree);
+	r = pakfire_packager_write_archive(packager, a, NULL, "chksums", &mtree, fmtree);
 	if (r) {
 		ERROR(packager->pakfire, "Could not add checksums to archive: %s\n",
 			archive_error_string(a));