libpkg: kill useless pkg_manifest_key API
modified libpkg/libpkg.ver
@@ -94,8 +94,6 @@ global:
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
modified libpkg/pkg.c
@@ -1110,13 +1110,13 @@ pkg_list_free(struct pkg *pkg, pkg_list list) {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1128,13 +1128,13 @@ pkg_open(struct pkg **pkg_p, const char *path, struct pkg_manifest_key *keys, in
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1146,8 +1146,7 @@ pkg_open_fd(struct pkg **pkg_p, int fd, struct pkg_manifest_key *keys, int flags
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -1155,14 +1154,14 @@ pkg_parse_archive(struct pkg *pkg, struct pkg_manifest_key *keys,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1225,7 +1224,7 @@ pkg_open2(struct pkg **pkg_p, struct archive **a, struct archive_entry **ae,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1236,7 +1235,7 @@ pkg_open2(struct pkg **pkg_p, struct archive **a, struct archive_entry **ae,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified libpkg/pkg.h.in
@@ -109,7 +109,6 @@ struct pkg_repo;
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -630,8 +629,8 @@ int pkg_is_valid(const struct pkg * restrict);
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -788,11 +787,9 @@ int pkg_addluascript_fileat(int fd, struct pkg *pkg, const char *path);
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1043,7 +1040,7 @@ int pkgdb_compact(struct pkgdb *db);
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified libpkg/pkg_add.c
@@ -999,8 +999,7 @@ pkg_globmatch(char *pattern, const char *name)
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -1098,8 +1097,7 @@ pkg_add_check_pkg_archive(struct pkgdb *db, struct pkg *pkg,
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -1200,7 +1198,7 @@ pkg_add_triggers(void)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1223,7 +1221,7 @@ pkg_add_common(struct pkgdb *db, const char *path, unsigned flags,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1250,8 +1248,7 @@ pkg_add_common(struct pkgdb *db, const char *path, unsigned flags,
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -1428,28 +1425,28 @@ cleanup:
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified libpkg/pkg_create.c
@@ -465,11 +465,11 @@ pkg_load_message_from_file(int fd, struct pkg *pkg, const char *path)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -481,29 +481,23 @@ static int
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
|
| - | |
|
|
|
|
|
modified libpkg/pkg_jobs.c
@@ -1051,7 +1051,6 @@ pkg_jobs_find_remote_pattern(struct pkg_jobs *j, struct job_pattern *jp)
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -1071,14 +1070,12 @@ pkg_jobs_find_remote_pattern(struct pkg_jobs *j, struct job_pattern *jp)
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -1093,7 +1090,6 @@ pkg_jobs_find_remote_pattern(struct pkg_jobs *j, struct job_pattern *jp)
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -2038,8 +2034,7 @@ pkg_jobs_type(struct pkg_jobs *j)
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -2094,9 +2089,9 @@ pkg_jobs_handle_install(struct pkg_solved *ps, struct pkg_jobs *j,
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2123,7 +2118,6 @@ static int
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -2155,8 +2149,6 @@ pkg_jobs_execute(struct pkg_jobs *j)
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
@@ -2195,7 +2187,7 @@ pkg_jobs_execute(struct pkg_jobs *j)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2212,7 +2204,6 @@ pkg_jobs_execute(struct pkg_jobs *j)
|
|
|
|
|
|
| - | |
|
|
|
|
|
modified libpkg/pkg_manifest.c
@@ -88,8 +88,6 @@ static struct pkg_manifest_key {
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
@@ -214,45 +212,8 @@ static struct pkg_manifest_key {
|
|
|
|
|
|
| - | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -273,7 +234,6 @@ urlencode(const char *src, xstring **dest)
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -775,12 +735,20 @@ pkg_set_deps_from_object(struct pkg *pkg, const ucl_object_t *obj)
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -789,20 +757,16 @@ parse_manifest(struct pkg *pkg, struct pkg_manifest_key *keys, ucl_object_t *obj
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -810,11 +774,11 @@ parse_manifest(struct pkg *pkg, struct pkg_manifest_key *keys, ucl_object_t *obj
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -822,24 +786,20 @@ pkg_parse_manifest_ucl (struct pkg *pkg, ucl_object_t *obj, struct pkg_manifest_
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -865,15 +825,14 @@ pkg_parse_manifest(struct pkg *pkg, const char *buf, size_t len, struct pkg_mani
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -906,7 +865,7 @@ pkg_parse_manifest_fileat(int dfd, struct pkg *pkg, const char *file,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -914,9 +873,9 @@ pkg_parse_manifest_fileat(int dfd, struct pkg *pkg, const char *file,
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
modified libpkg/pkg_repo_create.c
@@ -344,7 +344,6 @@ pkg_create_repo_worker(int mfd, int ffd, int pip,
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -372,7 +371,6 @@ pkg_create_repo_worker(int mfd, int ffd, int pip,
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -432,7 +430,7 @@ pkg_create_repo_worker(int mfd, int ffd, int pip,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -529,7 +527,6 @@ pkg_create_repo_worker(int mfd, int ffd, int pip,
|
|
|
|
|
|
| - | |
|
|
|
|
|
modified libpkg/private/pkg.h
@@ -657,7 +657,7 @@ ucl_object_t *pkg_lua_script_to_ucl(stringlist_t *);
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -748,11 +748,9 @@ char *pkg_checksum_generate_fileat(int fd, const char *path,
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
modified libpkg/repo/binary/query.c
@@ -426,7 +426,6 @@ pkg_repo_binary_ensure_loaded(struct pkg_repo *repo,
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -458,13 +457,12 @@ pkg_repo_binary_ensure_loaded(struct pkg_repo *repo,
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified libpkg/repo/binary/update.c
@@ -361,7 +361,7 @@ pkg_repo_binary_register_conflicts(const char *origin, char **conflicts,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -372,8 +372,7 @@ pkg_repo_binary_add_from_manifest(const char *buf, sqlite3 *sqlite, size_t len,
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -462,7 +461,6 @@ pkg_repo_binary_update_proceed(const char *name, struct pkg_repo *repo,
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -533,7 +531,7 @@ pkg_repo_binary_update_proceed(const char *name, struct pkg_repo *repo,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -573,7 +571,6 @@ cleanup:
|
|
|
|
|
|
| - | |
|
|
|
|
|
modified src/add.c
@@ -72,7 +72,6 @@ exec_add(int argc, char **argv)
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -140,7 +139,6 @@ exec_add(int argc, char **argv)
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -176,7 +174,7 @@ exec_add(int argc, char **argv)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -187,7 +185,6 @@ exec_add(int argc, char **argv)
|
|
|
|
|
|
| - | |
|
|
|
|
|
modified src/clean.c
@@ -291,7 +291,6 @@ exec_clean(int argc, char **argv)
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -382,7 +381,6 @@ exec_clean(int argc, char **argv)
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -411,7 +409,6 @@ exec_clean(int argc, char **argv)
|
|
|
|
|
|
| - | |
|
|
|
|
|
modified src/info.c
@@ -94,7 +94,6 @@ exec_info(int argc, char **argv)
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -287,17 +286,15 @@ exec_info(int argc, char **argv)
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
|
|
|
|
|
modified src/query.c
@@ -891,7 +891,6 @@ exec_query(int argc, char **argv)
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -1000,12 +999,10 @@ exec_query(int argc, char **argv)
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
|
| - | |
|
|
|
|
|
modified tests/lib/manifest.c
@@ -123,19 +123,13 @@ test_manifest(void)
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
|
|
|
|
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|