Use unsigned types for bitmaps.
modified libpkg/pkg.h
@@ -38,8 +38,10 @@
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -67,19 +69,19 @@ typedef enum {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -138,16 +140,16 @@ typedef enum {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -155,7 +157,7 @@ typedef enum {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -172,7 +174,7 @@ typedef enum {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -182,7 +184,7 @@ typedef enum {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -241,23 +243,23 @@ typedef enum _pkg_jobs_t {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -451,9 +453,9 @@ int pkg_shlibs(struct pkg *pkg, struct pkg_shlib **shlib);
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -480,7 +482,8 @@ int pkgdb_set2(struct pkgdb *db, struct pkg *pkg, ...);
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -503,7 +506,8 @@ int pkg_addrdep(struct pkg *pkg, const char *name, const char *origin, const
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -515,7 +519,9 @@ int pkg_addfile(struct pkg *pkg, const char *path, const char *sha256, bool chec
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -531,7 +537,8 @@ int pkg_adddir(struct pkg *pkg, const char *path, bool try);
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -674,7 +681,8 @@ int pkg_is_installed(struct pkgdb *db, const char *origin);
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -735,7 +743,7 @@ struct pkgdb_it *pkgdb_query_upgrades(struct pkgdb *db, const char *reponame, bo
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -744,19 +752,19 @@ struct pkgdb_it * pkgdb_query_which(struct pkgdb *db, const char *path);
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -766,7 +774,7 @@ struct pkgdb_it * pkgdb_query_shlib(struct pkgdb *db, const char *shlib);
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -787,12 +795,12 @@ int pkgdb_compact(struct pkgdb *db);
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -839,12 +847,14 @@ typedef enum pkg_formats { TAR, TGZ, TBZ, TXZ } pkg_formats;
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
modified libpkg/pkg_add.c
@@ -43,9 +43,9 @@
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -61,9 +61,9 @@ dep_installed(struct pkg_dep *dep, struct pkgdb *db) {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -118,22 +118,22 @@ do_extract(struct archive *a, struct archive_entry *ae)
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -167,7 +167,8 @@ pkg_add(struct pkgdb *db, const char *path, int flags)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
modified libpkg/pkg_create.c
@@ -44,15 +44,15 @@ static int
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -127,11 +127,11 @@ pkg_create_from_dir(struct pkg *pkg, const char *root,
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -183,20 +183,20 @@ int
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -312,10 +312,10 @@ int
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified libpkg/pkg_delete.c
@@ -39,12 +39,12 @@
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -120,11 +120,11 @@ pkg_delete(struct pkg *pkg, struct pkgdb *db, int flags)
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -156,9 +156,9 @@ pkg_delete_files(struct pkg *pkg, int force)
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -166,10 +166,10 @@ pkg_delete_dirs(__unused struct pkgdb *db, struct pkg *pkg, int force)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified libpkg/pkgdb.c
@@ -53,11 +53,11 @@
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -84,39 +84,39 @@ static struct column_mapping {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -150,8 +150,8 @@ load_val(sqlite3 *db, struct pkg *pkg, const char *sql, int flags,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -187,8 +187,8 @@ pkgdb_get_reponame(struct pkgdb *db, const char *repo)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -236,10 +236,10 @@ populate_pkg(sqlite3_stmt *stmt, struct pkg *pkg) {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -279,7 +279,7 @@ pkgdb_regex_extended(sqlite3_context *ctx, int argc, sqlite3_value **argv)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -300,8 +300,8 @@ pkgdb_now(sqlite3_context *ctx, int argc, __unused sqlite3_value **argv)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -317,14 +317,15 @@ pkgdb_myarch(sqlite3_context *ctx, int argc, sqlite3_value **argv)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -374,9 +375,9 @@ pkgdb_pkgge(sqlite3_context * ctx, int argc, sqlite3_value **argv)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -456,7 +457,7 @@ pkgdb_upgrade(struct pkgdb *db)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -607,10 +608,10 @@ pkgdb_init(sqlite3 *sdb)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -631,10 +632,10 @@ pkgdb_remote_init(struct pkgdb *db, const char *repo)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -706,14 +707,14 @@ pkgdb_open_multirepos(const char *dbdir, struct pkgdb *db)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -854,7 +855,7 @@ pkgdb_close(struct pkgdb *db)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -871,30 +872,30 @@ pkgdb_it_new(struct pkgdb *db, sqlite3_stmt *s, int type)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -944,8 +945,8 @@ pkgdb_it_free(struct pkgdb_it *it)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -993,7 +994,7 @@ pkgdb_get_pattern_query(const char *pattern, match_t match)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1023,9 +1024,9 @@ pkgdb_get_match_how(match_t match)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1054,8 +1055,8 @@ pkgdb_query(struct pkgdb *db, const char *pattern, match_t match)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1078,8 +1079,8 @@ pkgdb_query_which(struct pkgdb *db, const char *path)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1103,10 +1104,9 @@ pkgdb_query_shlib(struct pkgdb *db, const char *shlib)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1139,14 +1139,14 @@ pkgdb_is_dir_used(struct pkgdb *db, const char *dir, int64_t *res)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1186,12 +1186,12 @@ pkgdb_load_deps(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1236,9 +1236,9 @@ pkgdb_load_rdeps(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1276,14 +1276,14 @@ pkgdb_load_files(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1318,14 +1318,14 @@ pkgdb_load_dirs(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1343,15 +1343,15 @@ pkgdb_load_license(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1370,13 +1370,12 @@ pkgdb_load_user(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1399,15 +1398,14 @@ pkgdb_load_user(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1429,14 +1427,14 @@ pkgdb_load_group(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1454,9 +1452,9 @@ pkgdb_load_shlib(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1492,11 +1490,11 @@ pkgdb_load_scripts(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1540,11 +1538,11 @@ pkgdb_load_options(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1585,10 +1583,10 @@ static sql_prstmt sql_prepared_statements[PRSTMT_LAST] = {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1693,9 +1691,9 @@ static sql_prstmt sql_prepared_statements[PRSTMT_LAST] = {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1717,11 +1715,11 @@ prstmt_initialize(struct pkgdb *db)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1753,7 +1751,7 @@ run_prstmt(sql_prstmt_index s, ...)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1770,31 +1768,31 @@ prstmt_finalize(struct pkgdb *db)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1811,12 +1809,22 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1831,8 +1839,8 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1868,8 +1876,8 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1925,7 +1933,7 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2024,7 +2032,7 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2043,11 +2051,17 @@ pkgdb_update_shlibs(struct pkg *pkg, int64_t package_id, sqlite3 *s)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2057,14 +2071,16 @@ pkgdb_reanalyse_shlibs(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2079,7 +2095,7 @@ pkgdb_reanalyse_shlibs(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2093,8 +2109,8 @@ pkgdb_reanalyse_shlibs(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2107,7 +2123,8 @@ pkgdb_register_finale(struct pkgdb *db, int retcode)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2115,16 +2132,18 @@ pkgdb_register_ports(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2142,12 +2161,14 @@ pkgdb_unregister_pkg(struct pkgdb *db, const char *origin)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2173,11 +2194,11 @@ pkgdb_unregister_pkg(struct pkgdb *db, const char *origin)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2209,9 +2230,9 @@ sql_exec(sqlite3 *s, const char *sql, ...)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2237,9 +2258,10 @@ is_attached(sqlite3 *s, const char *name)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2269,10 +2291,10 @@ static int
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2307,10 +2329,10 @@ sql_on_all_attached_db(sqlite3 *s, struct sbuf *sql, const char *multireposql,
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2342,8 +2364,8 @@ pkgdb_detach_remotes(sqlite3 *s)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2370,9 +2392,9 @@ get_pragma(sqlite3 *s, const char *sql, int64_t *res)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2380,13 +2402,16 @@ pkgdb_compact(struct pkgdb *db)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
| + | |
|
|
|
|
|
@@ -2396,7 +2421,7 @@ pkgdb_compact(struct pkgdb *db)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2418,19 +2443,18 @@ create_temporary_pkgjobs(sqlite3 *s)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -2497,43 +2521,44 @@ struct pkgdb_it *
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2543,17 +2568,19 @@ pkgdb_query_installs(struct pkgdb *db, match_t match, int nbpkgs, char **pkgs,
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2647,7 +2674,9 @@ pkgdb_query_installs(struct pkgdb *db, match_t match, int nbpkgs, char **pkgs,
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2662,7 +2691,8 @@ pkgdb_query_installs(struct pkgdb *db, match_t match, int nbpkgs, char **pkgs,
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2677,11 +2707,11 @@ pkgdb_query_installs(struct pkgdb *db, match_t match, int nbpkgs, char **pkgs,
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2691,13 +2721,15 @@ pkgdb_query_upgrades(struct pkgdb *db, const char *repo, bool all)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2706,7 +2738,8 @@ pkgdb_query_upgrades(struct pkgdb *db, const char *repo, bool all)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2717,7 +2750,7 @@ pkgdb_query_upgrades(struct pkgdb *db, const char *repo, bool all)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2737,7 +2770,8 @@ pkgdb_query_upgrades(struct pkgdb *db, const char *repo, bool all)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2777,7 +2811,8 @@ pkgdb_query_upgrades(struct pkgdb *db, const char *repo, bool all)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2814,15 +2849,15 @@ pkgdb_query_upgrades(struct pkgdb *db, const char *repo, bool all)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2853,12 +2888,12 @@ pkgdb_query_downgrades(struct pkgdb *db, const char *repo)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2885,17 +2920,18 @@ pkgdb_query_autoremove(struct pkgdb *db)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2954,7 +2990,8 @@ pkgdb_query_delete(struct pkgdb *db, match_t match, int nbpkgs, char **pkgs, int
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2970,18 +3007,18 @@ struct pkgdb_it *
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -3000,7 +3037,9 @@ pkgdb_rquery(struct pkgdb *db, const char *pattern, match_t match,
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -3033,9 +3072,9 @@ static int
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -3094,16 +3133,16 @@ struct pkgdb_it *
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3178,27 +3217,29 @@ pkgdb_search(struct pkgdb *db, const char *pattern, match_t match,
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -3206,8 +3247,8 @@ pkgdb_integrity_append(struct pkgdb *db, struct pkg *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -3254,16 +3295,19 @@ pkgdb_integrity_append(struct pkgdb *db, struct pkg *p)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -3336,12 +3380,13 @@ pkgdb_integrity_check(struct pkgdb *db)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -3359,11 +3404,11 @@ pkgdb_integrity_conflict_local(struct pkgdb *db, const char *origin)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -3381,7 +3426,8 @@ pkgdb_vset(struct pkgdb *db, int64_t id, va_list ap)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -3429,10 +3475,10 @@ pkgdb_vset(struct pkgdb *db, int64_t id, va_list ap)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3445,12 +3491,13 @@ pkgdb_set2(struct pkgdb *db, struct pkg *pkg, ...)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3473,24 +3520,27 @@ pkgdb_file_set_cksum(struct pkgdb *db, struct pkg_file *file, const char *sha256
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -3498,7 +3548,8 @@ pkgdb_query_fetch(struct pkgdb *db, match_t match, int nbpkgs, char **pkgs,
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -3595,28 +3646,29 @@ pkgdb_query_fetch(struct pkgdb *db, match_t match, int nbpkgs, char **pkgs,
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -3629,8 +3681,8 @@ pkgdb_cmd(int argc, char **argv)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -3668,10 +3720,10 @@ pkgdb_unlock(struct pkgdb *db)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified libpkg/private/pkg.h
@@ -56,12 +56,12 @@
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -72,92 +72,92 @@ struct pkg {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -165,9 +165,9 @@ struct pkg_shlib {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -189,7 +189,7 @@ typedef enum {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -202,7 +202,8 @@ int pkg_script_run(struct pkg *, pkg_script type);
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -238,21 +239,27 @@ void pkg_shlib_free(struct pkg_shlib *);
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
modified libpkg/private/pkgdb.h
@@ -33,16 +33,16 @@
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|