From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 21 Oct 2024 17:33:27 +0000 (+0000)
Subject: archive: cookie: Rename __f to f now that variable is free again
X-Git-Tag: 0.9.30~975
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2de8cf7425a694b5820eadd1524e1b91adede2ec;p=pakfire.git

archive: cookie: Rename __f to f now that variable is free again

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

diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c
index 4cef9efda..e1342db13 100644
--- a/src/libpakfire/archive.c
+++ b/src/libpakfire/archive.c
@@ -801,7 +801,7 @@ struct pakfire_archive_read_cookie {
 	struct archive* a;
 
 	// File handle opened by the cookie
-	FILE* __f;
+	FILE* f;
 
 	// Some flags
 	int flags;
@@ -891,8 +891,8 @@ static int __pakfire_archive_read(struct pakfire_ctx* ctx,
 	struct pakfire_archive_read_cookie* cookie = data;
 
 	// Create a file descriptor
-	cookie->__f = fopencookie(cookie, "r", pakfire_archive_read_functions);
-	if (!cookie->__f) {
+	cookie->f = fopencookie(cookie, "r", pakfire_archive_read_functions);
+	if (!cookie->f) {
 		CTX_ERROR(ctx, "Could not open /%s: %m\n", cookie->path);
 		return PAKFIRE_WALK_ERROR;
 	}
@@ -952,7 +952,7 @@ AGAIN:
 	}
 
 	// Nothing found
-	if (!cookie->__f) {
+	if (!cookie->f) {
 		CTX_ERROR(archive->ctx, "Could not find /%s\n", path);
 
 		// No such file or directory
@@ -960,7 +960,7 @@ AGAIN:
 		goto ERROR;
 	}
 
-	return cookie->__f;
+	return cookie->f;
 
 ERROR:
 	if (cookie)