From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 20 Oct 2023 11:47:44 +0000 (+0000)
Subject: archive: Replace the legacy logger with the new context logger
X-Git-Tag: 0.9.30~1420
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d99dd64d28b17bdf17c0d8b6c4abefba38ccbf4;p=people%2Fms%2Fpakfire.git

archive: Replace the legacy logger with the new context logger

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

diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c
index aa3c67acd..0b43c7119 100644
--- a/src/libpakfire/archive.c
+++ b/src/libpakfire/archive.c
@@ -88,14 +88,14 @@ struct pakfire_archive {
 static FILE* pakfire_archive_clone_file(struct pakfire_archive* archive) {
 	int fd = fileno(archive->f);
 	if (fd < 0) {
-		ERROR(archive->pakfire, "Could not fetch the archive's file descriptor: %m\n");
+		CTX_ERROR(archive->ctx, "Could not fetch the archive's file descriptor: %m\n");
 		return NULL;
 	}
 
 	// Duplicate the file descriptor
 	fd = dup(fd);
 	if (fd < 0) {
-		ERROR(archive->pakfire, "Could not duplicate the file descriptor: %m\n");
+		CTX_ERROR(archive->ctx, "Could not duplicate the file descriptor: %m\n");
 		return NULL;
 	}
 
@@ -113,7 +113,7 @@ static int pakfire_archive_compute_digests(struct pakfire_archive* archive) {
 	r = pakfire_digests_compute_from_file(archive->ctx, &archive->digests,
 			PAKFIRE_ARCHIVE_CHECKSUM, archive->f);
 	if (r)
-		ERROR(archive->pakfire, "Could not calculate digest of %s: %m\n", archive->path);
+		CTX_ERROR(archive->ctx, "Could not calculate digest of %s: %m\n", archive->path);
 
 	return r;
 }
@@ -151,7 +151,7 @@ static struct archive* open_archive(struct pakfire_archive* archive, FILE* f) {
 	// Try opening the archive file
 	int r = archive_read_open_FILE(a, f);
 	if (r) {
-		ERROR(archive->pakfire, "Could not open archive %s: %s\n",
+		CTX_ERROR(archive->ctx, "Could not open archive %s: %s\n",
 			archive->path, archive_error_string(a));
 		goto ERROR;
 	}
@@ -255,7 +255,7 @@ static int pakfire_archive_parse_json_metadata(struct pakfire_archive* archive,
 	// Create tokener
 	struct json_tokener* tokener = json_tokener_new();
 	if (!tokener) {
-		ERROR(archive->pakfire, "Could not allocate JSON tokener: %m\n");
+		CTX_ERROR(archive->ctx, "Could not allocate JSON tokener: %m\n");
 		goto ERROR;
 	}
 
@@ -264,12 +264,12 @@ static int pakfire_archive_parse_json_metadata(struct pakfire_archive* archive,
 	if (!archive->metadata) {
 		enum json_tokener_error error = json_tokener_get_error(tokener);
 
-		ERROR(archive->pakfire, "JSON parsing error: %s\n",
+		CTX_ERROR(archive->ctx, "JSON parsing error: %s\n",
 			json_tokener_error_desc(error));
 		goto ERROR;
 	}
 
-	DEBUG(archive->pakfire, "Successfully parsed package metadata:\n%s\n",
+	CTX_DEBUG(archive->ctx, "Successfully parsed package metadata:\n%s\n",
 		json_object_to_json_string_ext(archive->metadata,
 			JSON_C_TO_STRING_PRETTY|JSON_C_TO_STRING_PRETTY_TAB));
 
@@ -287,7 +287,7 @@ static int pakfire_archive_parse_format(struct pakfire_archive* archive,
 		const char* data, const size_t length) {
 	// Check if format has already been set
 	if (archive->format) {
-		ERROR(archive->pakfire, "Archive format has already been parsed\n");
+		CTX_ERROR(archive->ctx, "Archive format has already been parsed\n");
 		return -EINVAL;
 	}
 
@@ -301,12 +301,12 @@ static int pakfire_archive_parse_format(struct pakfire_archive* archive,
 
 		// Break on anything else
 		default:
-			ERROR(archive->pakfire, "This version of Pakfire does not support "
+			CTX_ERROR(archive->ctx, "This version of Pakfire does not support "
 				"archive format %u\n", archive->format);
 			return -ENOTSUP;
 	}
 
-	DEBUG(archive->pakfire, "Archive format is %u\n", archive->format);
+	CTX_DEBUG(archive->ctx, "Archive format is %u\n", archive->format);
 
 	return 0;
 }
@@ -319,14 +319,14 @@ static int pakfire_archive_parse_scriptlet(struct pakfire_archive* archive,
 
 	// Check for any available space
 	if (archive->num_scriptlets >= MAX_SCRIPTLETS) {
-		ERROR(archive->pakfire, "Too many scriptlets\n");
+		CTX_ERROR(archive->ctx, "Too many scriptlets\n");
 		return -ENOBUFS;
 	}
 
 	// Determine type
 	type = pakfire_path_relpath(".scriptlets/", path);
 	if (!type) {
-		ERROR(archive->pakfire, "Could not determine the scriptlet type from '%s'\n", path);
+		CTX_ERROR(archive->ctx, "Could not determine the scriptlet type from '%s'\n", path);
 		return -EINVAL;
 	}
 
@@ -419,11 +419,11 @@ static int pakfire_archive_read_metadata(struct pakfire_archive* archive) {
 
 	// Check if the archive file actually has any contect
 	if (!archive->stat.st_size) {
-		ERROR(archive->pakfire, "Trying to open an empty archive file\n");
+		CTX_ERROR(archive->ctx, "Trying to open an empty archive file\n");
 		return -EINVAL;
 	}
 
-	DEBUG(archive->pakfire, "Reading archive metadata...\n");
+	CTX_DEBUG(archive->ctx, "Reading archive metadata...\n");
 
 	// Walk through the archive
 	r = pakfire_archive_walk(archive, __pakfire_archive_read_metadata,
@@ -433,13 +433,13 @@ static int pakfire_archive_read_metadata(struct pakfire_archive* archive) {
 
 	// Check if we could successfully read something
 	if (!archive->format) {
-		ERROR(archive->pakfire, "Archive has an unknown format\n");
+		CTX_ERROR(archive->ctx, "Archive has an unknown format\n");
 		return -ENOMSG;
 	}
 
 	// Check if we have read some metadata
 	if (!archive->metadata) {
-		ERROR(archive->pakfire, "Archive has no metadata\n");
+		CTX_ERROR(archive->ctx, "Archive has no metadata\n");
 		return -ENOMSG;
 	}
 
@@ -453,7 +453,7 @@ static int pakfire_archive_try_open(struct pakfire_archive* archive, const char*
 	if (!path)
 		return -EINVAL;
 
-	DEBUG(archive->pakfire, "Opening archive %s\n", path);
+	CTX_DEBUG(archive->ctx, "Opening archive %s\n", path);
 
 	// Store path
 	pakfire_string_set(archive->path, path);
@@ -466,21 +466,21 @@ static int pakfire_archive_try_open(struct pakfire_archive* archive, const char*
 	// Let the kernel know, that we will read the file sequentially
 	r = posix_fadvise(fileno(archive->f), 0, 0, POSIX_FADV_SEQUENTIAL);
 	if (r) {
-		ERROR(archive->pakfire, "posix_fadvise() failed: %m\n");
+		CTX_ERROR(archive->ctx, "posix_fadvise() failed: %m\n");
 		goto ERROR;
 	}
 
 	// Call stat() on f
 	r = fstat(fileno(archive->f), &archive->stat);
 	if (r) {
-		ERROR(archive->pakfire, "Could not stat archive: %m\n");
+		CTX_ERROR(archive->ctx, "Could not stat archive: %m\n");
 		goto ERROR;
 	}
 
 	// Read all package metadata
 	r = pakfire_archive_read_metadata(archive);
 	if (r) {
-		ERROR_ERRNO(archive->pakfire, r, "Could not open archive: %m\n");
+		CTX_ERROR(archive->ctx, "Could not open archive: %s\n", strerror(-r));
 		goto ERROR;
 	}
 
@@ -522,7 +522,7 @@ static struct json_object* pakfire_archive_metadata_get_object(
 		// Try finding a matching JSON object
 		r = json_object_object_get_ex(object, *key, &object);
 		if (!r) {
-			DEBUG(archive->pakfire, "Could not find JSON object at '%s': %m\n", *key);
+			CTX_DEBUG(archive->ctx, "Could not find JSON object at '%s': %m\n", *key);
 			break;
 		}
 	}
@@ -706,7 +706,7 @@ PAKFIRE_EXPORT FILE* pakfire_archive_read(struct pakfire_archive* archive, const
 	// Allocate a cookie
 	cookie = calloc(1, sizeof(*cookie));
 	if (!cookie) {
-		ERROR(archive->pakfire, "Could not allocate a cookie: %m\n");
+		CTX_ERROR(archive->ctx, "Could not allocate a cookie: %m\n");
 		goto ERROR;
 	}
 
@@ -719,14 +719,14 @@ PAKFIRE_EXPORT FILE* pakfire_archive_read(struct pakfire_archive* archive, const
 	// Store the path
 	r = pakfire_string_set(cookie->path, path);
 	if (r) {
-		ERROR(archive->pakfire, "Could not set path: %m\n");
+		CTX_ERROR(archive->ctx, "Could not set path: %m\n");
 		goto ERROR;
 	}
 
 	// Clone the archive file descriptor to read the file independently
 	cookie->f = pakfire_archive_clone_file(archive);
 	if (!cookie->f) {
-		ERROR(archive->pakfire, "Could not duplicate file descriptor for %s: %m\n",
+		CTX_ERROR(archive->ctx, "Could not duplicate file descriptor for %s: %m\n",
 			archive->path);
 		goto ERROR;
 	}
@@ -756,7 +756,7 @@ AGAIN:
 
 	// Nothing found
 	if (!cookie->__f) {
-		ERROR(archive->pakfire, "Could not find /%s\n", path);
+		CTX_ERROR(archive->ctx, "Could not find /%s\n", path);
 
 		// No such file or directory
 		errno = ENOENT;
@@ -781,7 +781,7 @@ int pakfire_archive_copy(struct pakfire_archive* archive, const char* path) {
 	if (size < 0)
 		return -EINVAL;
 
-	DEBUG(archive->pakfire, "Copying %s to %s...\n", archive->path, path);
+	CTX_DEBUG(archive->ctx, "Copying %s to %s...\n", archive->path, path);
 
 	// Ensure we copy from the very beginning
 	rewind(archive->f);
@@ -799,7 +799,7 @@ int pakfire_archive_copy(struct pakfire_archive* archive, const char* path) {
 	// Copy everything
 	ssize_t bytes_written = sendfile(fileno(f), fileno(archive->f), NULL, size);
 	if (bytes_written < size) {
-		ERROR(archive->pakfire, "Could not copy archive (%zd byte(s) written): %m\n",
+		CTX_ERROR(archive->ctx, "Could not copy archive (%zd byte(s) written): %m\n",
 			bytes_written);
 		goto ERROR;
 	}
@@ -824,7 +824,7 @@ static int pakfire_archive_link(struct pakfire_archive* archive, const char* pat
 	if (!path)
 		return -EINVAL;
 
-	DEBUG(archive->pakfire, "Linking %s to %s...\n", archive->path, path);
+	CTX_DEBUG(archive->ctx, "Linking %s to %s...\n", archive->path, path);
 
 	// Delete the destination file (if it exists)
 	unlink(path);
@@ -832,7 +832,7 @@ static int pakfire_archive_link(struct pakfire_archive* archive, const char* pat
 	// Create the new link
 	r = link(archive->path, path);
 	if (r) {
-		DEBUG(archive->pakfire, "Could not create hardlink %s: %m\n", path);
+		CTX_DEBUG(archive->ctx, "Could not create hardlink %s: %m\n", path);
 		return r;
 	}
 
@@ -877,7 +877,7 @@ static int __pakfire_archive_extract(struct pakfire_archive* archive,
 	// Fetch NEVRA
 	const char* nevra = pakfire_package_get_string(pkg, PAKFIRE_PKG_NEVRA);
 
-	DEBUG(archive->pakfire, "Extracting %s\n", archive->path);
+	CTX_DEBUG(archive->ctx, "Extracting %s\n", archive->path);
 
 	// Copy everything to path if set
 	if (path) {
@@ -993,9 +993,9 @@ int pakfire_archive_check_digest(struct pakfire_archive* archive,
 		char* expected_hexdigest = __pakfire_hexlify(digest, length);
 		char* computed_hexdigest = __pakfire_hexlify(computed_digest, computed_length);
 
-		ERROR(archive->pakfire, "Archive digest does not match for %s:\n", archive->path);
-		ERROR(archive->pakfire, "  Expected: %s\n", expected_hexdigest);
-		ERROR(archive->pakfire, "  Computed: %s\n", computed_hexdigest);
+		CTX_ERROR(archive->ctx, "Archive digest does not match for %s:\n", archive->path);
+		CTX_ERROR(archive->ctx, "  Expected: %s\n", expected_hexdigest);
+		CTX_ERROR(archive->ctx, "  Computed: %s\n", computed_hexdigest);
 
 		if (expected_hexdigest)
 			free(expected_hexdigest);
@@ -1016,7 +1016,7 @@ static int pakfire_archive_import_filelist_from_json(
 	// Fetch the array with the filelist
 	array = pakfire_archive_metadata_get_object(archive, "filelist", NULL);
 	if (!array) {
-		ERROR(archive->pakfire, "Archive has no filelist: %m\n");
+		CTX_ERROR(archive->ctx, "Archive has no filelist: %m\n");
 		return 1;
 	}
 
@@ -1070,7 +1070,7 @@ static int pakfire_archive_make_package_from_json(struct pakfire_archive* archiv
 #ifdef ENABLE_DEBUG
 	const char* nevra = pakfire_package_get_string(pkg, PAKFIRE_PKG_NEVRA);
 
-	DEBUG(archive->pakfire, "Created package %s (%p) from archive %p\n",
+	CTX_DEBUG(archive->ctx, "Created package %s (%p) from archive %p\n",
 		nevra, pkg, archive);
 #endif