From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 9 Mar 2021 18:09:53 +0000 (+0000)
Subject: packager: Write format using buffer helper function, too
X-Git-Tag: 0.9.28~1285^2~589
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a18d6f8b7244cfad2ea30e3ddd25f26c1fcd622a;p=pakfire.git

packager: Write format using buffer helper function, too

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

diff --git a/src/libpakfire/packager.c b/src/libpakfire/packager.c
index da1fc5574..acdfec9fb 100644
--- a/src/libpakfire/packager.c
+++ b/src/libpakfire/packager.c
@@ -323,40 +323,8 @@ static int pakfire_packager_write_format(struct pakfire_packager* packager,
 		struct archive* a) {
 	const char buffer[] = TO_STRING(PACKAGE_FORMAT) "\n";
 
-	// Create a new file entry
-	struct archive_entry* entry = archive_entry_new();
-	if (!entry)
-		return 1;
-
-	// Set filename
-	archive_entry_set_pathname(entry, PAKFIRE_ARCHIVE_FN_FORMAT);
-
-	// This is a regular file
-    archive_entry_set_filetype(entry, AE_IFREG);
-    archive_entry_set_perm(entry, 0644);
-
-	// Set length
-	archive_entry_set_size(entry, strlen(buffer));
-
-	// This is the end of the header
-	int r = archive_write_header(a, entry);
-	if (r) {
-		ERROR(packager->pakfire, "Error writing header: %s\n", archive_error_string(a));
-		archive_entry_free(entry);
-		return r;
-	}
-
-	// Write content
-	r = archive_write_data(a, buffer, strlen(buffer));
-	if (r < 0) {
-		ERROR(packager->pakfire, "Error writing data: %s\n", archive_error_string(a));
-		archive_entry_free(entry);
-		return r;
-	}
-
-	archive_entry_free(entry);
-
-	return 0;
+	return pakfire_packager_write_file_from_buffer(packager, a,
+		PAKFIRE_ARCHIVE_FN_FORMAT, buffer);
 }
 
 static char* pakfire_package_make_metadata(struct pakfire_packager* packager) {