filelists: Rename *_append() to *_add()

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

diff --git a/src/_pakfire/package.c b/src/_pakfire/package.c
index fdb6f118d377e3692b2bb7d35243dfc04d642def..68f3544da47ed0d3eb6626e84ae2b8db37cf93f4 100644 (file)
--- a/src/_pakfire/package.c
+++ b/src/_pakfire/package.c
@@ -605,7 +605,7 @@ static int Package_set_filelist(PackageObject* self, PyObject* value) {
                pakfire_file_set_path(file, path);
 
                // Append the file to the filelist
-               pakfire_filelist_append(filelist, file);
+               pakfire_filelist_add(filelist, file);
                pakfire_file_unref(file);
        }
 

diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c
index f33d1a28b4456b307b43e0c7ce915ddb792e8880..df1e5ddf72e27b90ccc4984930ca323f1f0024e8 100644 (file)
--- a/src/libpakfire/archive.c
+++ b/src/libpakfire/archive.c
@@ -1043,7 +1043,7 @@ static int pakfire_archive_make_filelist_from_json(struct pakfire_archive* archi
                }
 
                // Append the file to the filelist
-               r = pakfire_filelist_append(list, file);
+               r = pakfire_filelist_add(list, file);
                if (r) {
                        pakfire_file_unref(file);
                        goto ERROR;

diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c
index 0b8afb137a59a06bfe7b7e0df968851a23476609..838ea1e6da690212f37da20767711ed475d81999 100644 (file)
--- a/src/libpakfire/build.c
+++ b/src/libpakfire/build.c
@@ -1038,7 +1038,7 @@ static int __pakfire_build_remove_static_libraries(
 
        // Find all static libraries
        if (pakfire_file_matches_class(file, PAKFIRE_FILE_STATIC_LIBRARY))
-               return pakfire_filelist_append(removees, file);
+               return pakfire_filelist_add(removees, file);
 
        return 0;
 }
@@ -1055,7 +1055,7 @@ static int __pakfire_build_remove_libtool_archives(
 
        // Find all libtool archive files
        if (pakfire_file_matches_class(file, PAKFIRE_FILE_LIBTOOL_ARCHIVE))
-               return pakfire_filelist_append(removees, file);
+               return pakfire_filelist_add(removees, file);
 
        return 0;
 }

diff --git a/src/libpakfire/compress.c b/src/libpakfire/compress.c
index 347ec13ef5d2482f77276223a91c503870882089..b39c7f9a105eece0fb4ea422441cb69f4d4915ad 100644 (file)
--- a/src/libpakfire/compress.c
+++ b/src/libpakfire/compress.c
@@ -689,7 +689,7 @@ static int __pakfire_extract(struct pakfire* pakfire, struct archive* a,
                        goto ERROR;
 
                // Append the file to the list
-               r = pakfire_filelist_append(data->filelist, file);
+               r = pakfire_filelist_add(data->filelist, file);
                if (r)
                        goto ERROR;
        }

diff --git a/src/libpakfire/db.c b/src/libpakfire/db.c
index 3483b346dabc2eb645a2fb42e2ab8a8bbadf4b28..8857647a1ccd7bb257988214519d8bd29fdb8754 100644 (file)
--- a/src/libpakfire/db.c
+++ b/src/libpakfire/db.c
@@ -2218,7 +2218,7 @@ static int pakfire_db_load_file(struct pakfire_db* db, struct pakfire_filelist*
                goto ERROR;
 
        // Append the file to the filelist
-       r = pakfire_filelist_append(filelist, file);
+       r = pakfire_filelist_add(filelist, file);
        if (r)
                goto ERROR;
 

diff --git a/src/libpakfire/filelist.c b/src/libpakfire/filelist.c
index cc28d8e316de6ed2467c9e254b465372f614818a..c1adf7cc8539f035cc9326c309163030f0fcf66b 100644 (file)
--- a/src/libpakfire/filelist.c
+++ b/src/libpakfire/filelist.c
@@ -139,7 +139,7 @@ PAKFIRE_EXPORT struct pakfire_file* pakfire_filelist_get(struct pakfire_filelist
        return pakfire_file_ref(element->file);
 }
 
-PAKFIRE_EXPORT int pakfire_filelist_append(struct pakfire_filelist* list, struct pakfire_file* file) {
+PAKFIRE_EXPORT int pakfire_filelist_add(struct pakfire_filelist* list, struct pakfire_file* file) {
        struct pakfire_filelist_element* element = NULL;
        struct pakfire_filelist_element* e = NULL;
 
@@ -365,7 +365,7 @@ int pakfire_filelist_scan(struct pakfire_filelist* list, const char* root,
                        goto ERROR;
 
                // Append it to the list
-               r = pakfire_filelist_append(list, file);
+               r = pakfire_filelist_add(list, file);
                if (r) {
                        pakfire_file_unref(file);
                        goto ERROR;
@@ -502,7 +502,7 @@ int pakfire_filelist_verify(struct pakfire_filelist* list, struct pakfire_fileli
                // If the verification failed, we append it to the errors list
                if (status) {
                        // Append the file to the error list
-                       r = pakfire_filelist_append(errors, element->file);
+                       r = pakfire_filelist_add(errors, element->file);
                        if (r)
                                goto ERROR;
                }

diff --git a/src/libpakfire/include/pakfire/filelist.h b/src/libpakfire/include/pakfire/filelist.h
index 00f143ba39dc59a6f0e50200e23e50fc78c41080..f347dd6baaec1198495c830ea295f40e9fc5ea69 100644 (file)
--- a/src/libpakfire/include/pakfire/filelist.h
+++ b/src/libpakfire/include/pakfire/filelist.h
@@ -35,7 +35,8 @@ int pakfire_filelist_is_empty(struct pakfire_filelist* list);
 void pakfire_filelist_clear(struct pakfire_filelist* list);
 
 struct pakfire_file* pakfire_filelist_get(struct pakfire_filelist* list, size_t index);
-int pakfire_filelist_append(struct pakfire_filelist* list, struct pakfire_file* file);
+
+int pakfire_filelist_add(struct pakfire_filelist* list, struct pakfire_file* file);
 
 #ifdef PAKFIRE_PRIVATE
 

diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym
index c459772808e749434f26722b6dbb5a78574a5c1e..12a42b32a75922c8115832f65b25eb87c68a273e 100644 (file)
--- a/src/libpakfire/libpakfire.sym
+++ b/src/libpakfire/libpakfire.sym
@@ -115,7 +115,7 @@ global:
        pakfire_file_unref;
 
        # filelist
-       pakfire_filelist_append;
+       pakfire_filelist_add;
        pakfire_filelist_clear;
        pakfire_filelist_create;
        pakfire_filelist_get;

diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c
index abd38f408c5e2537ae760654dc29282f105ce332..a37e8966aab1d0c384f3ecf77585bc8044adf0dd 100644 (file)
--- a/src/libpakfire/package.c
+++ b/src/libpakfire/package.c
@@ -1467,7 +1467,7 @@ static int __pakfire_package_fetch_filelist(void* data, Solvable* s, Repodata* r
                goto ERROR;
 
        // Append the file to the filelist
-       r = pakfire_filelist_append(search->filelist, file);
+       r = pakfire_filelist_add(search->filelist, file);
        if (r)
                goto ERROR;
 

diff --git a/src/libpakfire/packager.c b/src/libpakfire/packager.c
index ab5d160f6c146c074aa14e72be6e57c80dcca47f..8e6ddc1942b92128ab57991bbd7cf2e7d6bf153e 100644 (file)
--- a/src/libpakfire/packager.c
+++ b/src/libpakfire/packager.c
@@ -627,7 +627,7 @@ int pakfire_packager_add_file(struct pakfire_packager* packager, struct pakfire_
        }
 
        // Append the file to the filelist
-       return pakfire_filelist_append(packager->filelist, file);
+       return pakfire_filelist_add(packager->filelist, file);
 }
 
 int pakfire_packager_add(struct pakfire_packager* packager,

diff --git a/tests/libpakfire/package.c b/tests/libpakfire/package.c
index 8c9764064bffb47db667d4db88ab42c8f96d3ae9..833ce530abd5a312b38d31b42aede74cd7bddeec 100644 (file)
--- a/tests/libpakfire/package.c
+++ b/tests/libpakfire/package.c
@@ -260,7 +260,7 @@ static int test_filelist(const struct test* t) {
        ASSERT_SUCCESS(pakfire_file_set_path(file, "/bin/bash"));
 
        // Append the file to the filelist
-       ASSERT_SUCCESS(pakfire_filelist_append(filelist, file));
+       ASSERT_SUCCESS(pakfire_filelist_add(filelist, file));
 
        // Free the file
        pakfire_file_unref(file);