| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | src/util/cleanupdelta.c | 10 | ||||
| -rw-r--r-- | src/util/pactree.c | 18 | ||||
| -rw-r--r-- | src/util/testdb.c | 14 | ||||
| -rw-r--r-- | src/util/testpkg.c | 8 |
diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 5ee59dbb..70fb7607 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -29,7 +29,7 @@ #define BASENAME "cleanupdelta" -pmhandle_t *handle = NULL; +alpm_handle_t *handle = NULL; static void cleanup(int signum) { if(handle && alpm_release(handle) == -1) { @@ -39,7 +39,7 @@ static void cleanup(int signum) { exit(signum); } -static void output_cb(pmloglevel_t level, const char *fmt, va_list args) +static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { if(strlen(fmt)) { switch(level) { @@ -57,7 +57,7 @@ static void checkpkgs(alpm_list_t *pkglist) { alpm_list_t *i, *j; for(i = pkglist; i; i = alpm_list_next(i)) { - pmpkg_t *pkg = alpm_list_getdata(i); + alpm_pkg_t *pkg = alpm_list_getdata(i); alpm_list_t *unused = alpm_pkg_unused_deltas(pkg); for(j = unused; j; j = alpm_list_next(j)) { char *delta = alpm_list_getdata(j); @@ -69,7 +69,7 @@ static void checkpkgs(alpm_list_t *pkglist) static void checkdbs(const char *dbpath, alpm_list_t *dbnames) { char syncdbpath[PATH_MAX]; - pmdb_t *db = NULL; + alpm_db_t *db = NULL; alpm_list_t *i; for(i = dbnames; i; i = alpm_list_next(i)) { @@ -96,7 +96,7 @@ static void usage(void) { int main(int argc, char *argv[]) { const char *dbpath = DBPATH; - enum _pmerrno_t err; + enum _alpm_errno_t err; int a = 1; alpm_list_t *dbnames = NULL; diff --git a/src/util/pactree.c b/src/util/pactree.c index 5beaa5a7..7b87ac13 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -76,7 +76,7 @@ static struct color_choices no_color = { }; /* globals */ -pmhandle_t *handle = NULL; +alpm_handle_t *handle = NULL; alpm_list_t *walked = NULL; alpm_list_t *provisions = NULL; @@ -316,9 +316,9 @@ static void print_end(void) } } -static pmpkg_t *get_pkg_from_dbs(alpm_list_t *dbs, const char *needle) { +static alpm_pkg_t *get_pkg_from_dbs(alpm_list_t *dbs, const char *needle) { alpm_list_t *i; - pmpkg_t *ret; + alpm_pkg_t *ret; for(i = dbs; i; i = alpm_list_next(i)) { ret = alpm_db_get_pkg(alpm_list_getdata(i), needle); @@ -332,7 +332,7 @@ static pmpkg_t *get_pkg_from_dbs(alpm_list_t *dbs, const char *needle) { /** * walk dependencies in reverse, showing packages which require the target */ -static void walk_reverse_deps(alpm_list_t *dblist, pmpkg_t *pkg, int depth) +static void walk_reverse_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, int depth) { alpm_list_t *required_by, *i; @@ -364,7 +364,7 @@ static void walk_reverse_deps(alpm_list_t *dblist, pmpkg_t *pkg, int depth) /** * walk dependencies, showing dependencies of the target */ -static void walk_deps(alpm_list_t *dblist, pmpkg_t *pkg, int depth) +static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, int depth) { alpm_list_t *i; @@ -375,8 +375,8 @@ static void walk_deps(alpm_list_t *dblist, pmpkg_t *pkg, int depth) walked = alpm_list_add(walked, (void *)alpm_pkg_get_name(pkg)); for(i = alpm_pkg_get_depends(pkg); i; i = alpm_list_next(i)) { - pmdepend_t *depend = alpm_list_getdata(i); - pmpkg_t *provider = alpm_find_dbs_satisfier(handle, dblist, depend->name); + alpm_depend_t *depend = alpm_list_getdata(i); + alpm_pkg_t *provider = alpm_find_dbs_satisfier(handle, dblist, depend->name); if(provider) { const char *provname = alpm_pkg_get_name(provider); @@ -401,9 +401,9 @@ static void walk_deps(alpm_list_t *dblist, pmpkg_t *pkg, int depth) int main(int argc, char *argv[]) { int freelist = 0, ret = 0; - enum _pmerrno_t err; + enum _alpm_errno_t err; const char *target_name; - pmpkg_t *pkg; + alpm_pkg_t *pkg; alpm_list_t *dblist = NULL; if(parse_options(argc, argv) != 0) { diff --git a/src/util/testdb.c b/src/util/testdb.c index af5007e2..b8ab33ca 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -31,7 +31,7 @@ #define BASENAME "testdb" -pmhandle_t *handle = NULL; +alpm_handle_t *handle = NULL; static void cleanup(int signum) { if(handle && alpm_release(handle) == -1) { @@ -41,7 +41,7 @@ static void cleanup(int signum) { exit(signum); } -static void output_cb(pmloglevel_t level, const char *fmt, va_list args) +static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { if(strlen(fmt)) { switch(level) { @@ -100,7 +100,7 @@ static int checkdeps(alpm_list_t *pkglist) /* check dependencies */ data = alpm_checkdeps(handle, pkglist, NULL, pkglist, 0); for(i = data; i; i = alpm_list_next(i)) { - pmdepmissing_t *miss = alpm_list_getdata(i); + alpm_depmissing_t *miss = alpm_list_getdata(i); char *depstring = alpm_dep_compute_string(miss->depend); printf("missing dependency for %s : %s\n", miss->target, depstring); @@ -118,7 +118,7 @@ static int checkconflicts(alpm_list_t *pkglist) /* check conflicts */ data = alpm_checkconflicts(handle, pkglist); for(i = data; i; i = i->next) { - pmconflict_t *conflict = alpm_list_getdata(i); + alpm_conflict_t *conflict = alpm_list_getdata(i); printf("%s conflicts with %s\n", conflict->package1, conflict->package2); ret++; @@ -129,7 +129,7 @@ static int checkconflicts(alpm_list_t *pkglist) static int check_localdb(void) { int ret = 0; - pmdb_t *db = NULL; + alpm_db_t *db = NULL; alpm_list_t *pkglist; ret = check_localdb_files(); @@ -146,7 +146,7 @@ static int check_localdb(void) { static int check_syncdbs(alpm_list_t *dbnames) { int ret = 0; - pmdb_t *db = NULL; + alpm_db_t *db = NULL; alpm_list_t *i, *pkglist, *syncpkglist = NULL; for(i = dbnames; i; i = alpm_list_next(i)) { @@ -180,7 +180,7 @@ static void usage(void) { int main(int argc, char *argv[]) { int ret = 0; - enum _pmerrno_t err; + enum _alpm_errno_t err; const char *dbpath = DBPATH; int a = 1; alpm_list_t *dbnames = NULL; diff --git a/src/util/testpkg.c b/src/util/testpkg.c index d4d058d8..a745984d 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -24,7 +24,7 @@ #define BASENAME "testpkg" -static void output_cb(pmloglevel_t level, const char *fmt, va_list args) +static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { if(fmt[0] == '\0') { return; @@ -40,9 +40,9 @@ static void output_cb(pmloglevel_t level, const char *fmt, va_list args) int main(int argc, char *argv[]) { int retval = 1; /* default = false */ - pmhandle_t *handle; - enum _pmerrno_t err; - pmpkg_t *pkg = NULL; + alpm_handle_t *handle; + enum _alpm_errno_t err; + alpm_pkg_t *pkg = NULL; if(argc != 2) { fprintf(stderr, "usage: %s <package file>\n", BASENAME); |