From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 5 Oct 2021 12:09:16 +0000 (+0000)
Subject: request: Remove brainded cleanup routine
X-Git-Tag: 0.9.28~910
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d41bcb8a6a423c348a8d15429d7d9102c4d9ea91;p=pakfire.git

request: Remove brainded cleanup routine

This is now done more elegantly in pakfire_repo_clean.

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

diff --git a/src/libpakfire/request.c b/src/libpakfire/request.c
index ab54a191f..d69566889 100644
--- a/src/libpakfire/request.c
+++ b/src/libpakfire/request.c
@@ -49,9 +49,6 @@ struct pakfire_request {
 
 	Solver* solver;
 	Queue jobs;
-
-	// Temporary files
-	char** cleanup_files;
 };
 
 /*
@@ -64,29 +61,10 @@ const char* pakfire_multiinstall_packages[] = {
 };
 
 static void pakfire_request_free(struct pakfire_request* request) {
-	int r;
-
 	if (request->solver)
 		solver_free(request->solver);
 	queue_free(&request->jobs);
 
-	// Remove all cleanup files
-	if (request->cleanup_files) {
-		for (char** p = request->cleanup_files; *p; p++) {
-			DEBUG(request->pakfire, "Cleaning up %s...\n", *p);
-
-			// Unlink file
-			r = unlink(*p);
-			if (r && errno != ENOENT) {
-				ERROR(request->pakfire, "Could not unlink %s: %m\n", *p);
-			}
-
-			free(*p);
-		}
-
-		free(request->cleanup_files);
-	}
-
 	pakfire_unref(request->pakfire);
 	free(request);
 }
@@ -461,32 +439,6 @@ ERROR:
 	return r;
 }
 
-static int pakfire_request_cleanup_file(
-		struct pakfire_request* request, const char* path) {
-	size_t length = 0;
-
-	// Count existing elements
-	if (request->cleanup_files) {
-		for (char** p = request->cleanup_files; *p; p++)
-			length++;
-	}
-
-	// Increase size of array
-	request->cleanup_files = reallocarray(request->cleanup_files,
-		length + 2, sizeof(*request->cleanup_files));
-	if (!request->cleanup_files) {
-		ERROR(request->pakfire, "Could not (re-)allocate cleanup_files: %m\n");
-		return 1;
-	}
-
-	request->cleanup_files[length] = strdup(path);
-
-	// Terminate array
-	request->cleanup_files[length + 1] = NULL;
-
-	return 0;
-}
-
 static int pakfire_request_add_url(struct pakfire_request* request, int action,
 		const char* url, int extra_flags) {
 	struct pakfire_downloader* downloader;
@@ -513,11 +465,6 @@ static int pakfire_request_add_url(struct pakfire_request* request, int action,
 	if (r)
 		goto ERROR;
 
-	// Cleanup this file when the request is being freed
-	r = pakfire_request_cleanup_file(request, path);
-	if (r)
-		goto ERROR;
-
 	// Success
 	r = 0;