archive: Remove unnecessary underscores from functions

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

diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c
index 36c27a063ac7887ff7993b1bc0c7c945586908ff..fc6bdd5694cdc341580a58726f264f60ea66eee3 100644 (file)
--- a/src/libpakfire/archive.c
+++ b/src/libpakfire/archive.c
@@ -570,7 +570,7 @@ static int64_t pakfire_archive_metadata_get_int64(
        return json_object_get_int64(object);
 }
 
-static int __pakfire_archive_filter_payload(struct pakfire_ctx* ctx,
+static int pakfire_archive_filter_payload(struct pakfire_ctx* ctx,
                struct archive* a, struct archive_entry* entry, void* p) {
        const char* path = archive_entry_pathname(entry);
        if (!path)
@@ -619,14 +619,14 @@ struct pakfire_archive_read_cookie {
        unsigned int followed_symlinks;
 };
 
-static ssize_t __pakfire_archive_cookie_read(void* c, char* buffer, size_t size) {
+static ssize_t pakfire_archive_cookie_read(void* c, char* buffer, size_t size) {
        struct pakfire_archive_read_cookie* cookie = (struct pakfire_archive_read_cookie*)c;
 
        // Read the data directly from the archive
        return archive_read_data(cookie->a, buffer, size);
 }
 
-static int __pakfire_archive_cookie_close(void* c) {
+static int pakfire_archive_cookie_close(void* c) {
        struct pakfire_archive_read_cookie* cookie = (struct pakfire_archive_read_cookie*)c;
 
        if (cookie->archive)
@@ -643,12 +643,12 @@ static int __pakfire_archive_cookie_close(void* c) {
 }
 
 static cookie_io_functions_t pakfire_archive_read_functions = {
-       .read  = __pakfire_archive_cookie_read,
-       .close = __pakfire_archive_cookie_close,
+       .read  = pakfire_archive_cookie_read,
+       .close = pakfire_archive_cookie_close,
 };
 
 // Tries to find a matching file in the archive
-static int __pakfire_archive_read_filter(struct pakfire_ctx* ctx, struct archive* a,
+static int pakfire_archive_read_filter(struct pakfire_ctx* ctx, struct archive* a,
                struct archive_entry* e, void* data) {
        struct pakfire_archive_read_cookie* cookie = data;
        const char* symlink = NULL;
@@ -757,7 +757,7 @@ AGAIN:
 
        // Walk through the archive
        r = pakfire_walk(archive->ctx, cookie->a, __pakfire_archive_read,
-                       __pakfire_archive_read_filter, cookie);
+                       pakfire_archive_read_filter, cookie);
        if (r) {
                switch (-r) {
                        case EAGAIN:
@@ -785,7 +785,7 @@ AGAIN:
 
 ERROR:
        if (cookie)
-               __pakfire_archive_cookie_close(cookie);
+               pakfire_archive_cookie_close(cookie);
 
        return NULL;
 }
@@ -932,7 +932,7 @@ static int __pakfire_archive_extract(struct pakfire_archive* archive,
 
        // Extract
        r = pakfire_extract(archive->pakfire, a, archive->stat.st_size,
-               filelist, prefix, nevra, __pakfire_archive_filter_payload, flags);
+               filelist, prefix, nevra, pakfire_archive_filter_payload, flags);
        if (r)
                goto ERROR;
 
@@ -1369,7 +1369,7 @@ struct pakfire_scriptlet* pakfire_archive_get_scriptlet(
 /*
        systemd sysusers
 */
-static int __pakfire_archive_filter_systemd_sysusers(struct pakfire_ctx* ctx,
+static int pakfire_archive_filter_systemd_sysusers(struct pakfire_ctx* ctx,
                struct archive* a, struct archive_entry* e, void* data) {
        const char* path = archive_entry_pathname(e);
 
@@ -1392,7 +1392,7 @@ static ssize_t pakfire_archive_stream_payload(
        return bytes_read;
 }
 
-static int __pakfire_archive_handle_systemd_sysusers(struct pakfire_ctx* ctx,
+static int pakfire_archive_handle_systemd_sysusers(struct pakfire_ctx* ctx,
                struct archive* a, struct archive_entry* e, void* data) {
        struct pakfire_jail* jail = NULL;
        char replace[PATH_MAX];
@@ -1427,10 +1427,8 @@ ERROR:
 }
 
 int pakfire_archive_apply_systemd_sysusers(struct pakfire_archive* archive) {
-       pakfire_archive_walk(archive,
-                       __pakfire_archive_handle_systemd_sysusers,
-                       __pakfire_archive_filter_systemd_sysusers,
-                       archive->pakfire);
+       pakfire_archive_walk(archive, pakfire_archive_handle_systemd_sysusers,
+               pakfire_archive_filter_systemd_sysusers, archive->pakfire);
 
        return 0;
 }