]> git.ipfire.org Git - pakfire.git/commitdiff
request: Remove brainded cleanup routine
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 Oct 2021 12:09:16 +0000 (12:09 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 Oct 2021 12:09:16 +0000 (12:09 +0000)
This is now done more elegantly in pakfire_repo_clean.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/libpakfire/request.c

index ab54a191f2b8d984368ea227d6868602ccc7054f..d69566889cf22a516e46a3cca3a32b0c7580e269 100644 (file)
@@ -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;