bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename alpm_db_get{pkg,grp}cache to alpm_db_get_{pkg,grp}cache

Browse source 
This is more consistent with the private functions :
_alpm_db_get_{pkg,grp}cache

Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Xavier Chantry 2008-08-17 19:36:28 +02:00 • committed by Dan McGee
parent 0701356260
commit d05882db9e
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/libalpm/alpm.h
View file

@ -170,10 +170,10 @@ int alpm_db_setserver(pmdb_t *db, const char *url);
int alpm_db_update(int level, pmdb_t *db); int alpm_db_update(int level, pmdb_t *db);
pmpkg_t *alpm_db_get_pkg(pmdb_t *db, const char *name); pmpkg_t *alpm_db_get_pkg(pmdb_t *db, const char *name);
alpm_list_t *alpm_db_getpkgcache(pmdb_t *db); alpm_list_t *alpm_db_get_pkgcache(pmdb_t *db);
pmgrp_t *alpm_db_readgrp(pmdb_t *db, const char *name); pmgrp_t *alpm_db_readgrp(pmdb_t *db, const char *name);
alpm_list_t *alpm_db_getgrpcache(pmdb_t *db); alpm_list_t *alpm_db_get_grpcache(pmdb_t *db);
alpm_list_t *alpm_db_search(pmdb_t *db, const alpm_list_t* needles); alpm_list_t *alpm_db_search(pmdb_t *db, const alpm_list_t* needles);
/* /*

4
lib/libalpm/db.c
View file

@ -264,7 +264,7 @@ pmpkg_t SYMEXPORT *alpm_db_get_pkg(pmdb_t *db, const char *name)
* @param db pointer to the package database to get the package from * @param db pointer to the package database to get the package from
* @return the list of packages on success, NULL on error * @return the list of packages on success, NULL on error
*/ */
alpm_list_t SYMEXPORT *alpm_db_getpkgcache(pmdb_t *db) alpm_list_t SYMEXPORT *alpm_db_get_pkgcache(pmdb_t *db)
{ {
ALPM_LOG_FUNC; ALPM_LOG_FUNC;
@ -296,7 +296,7 @@ pmgrp_t SYMEXPORT *alpm_db_readgrp(pmdb_t *db, const char *name)
* @param db pointer to the package database to get the group from * @param db pointer to the package database to get the group from
* @return the list of groups on success, NULL on error * @return the list of groups on success, NULL on error
*/ */
alpm_list_t SYMEXPORT *alpm_db_getgrpcache(pmdb_t *db) alpm_list_t SYMEXPORT *alpm_db_get_grpcache(pmdb_t *db)
{ {
ALPM_LOG_FUNC; ALPM_LOG_FUNC;

8
src/pacman/query.c
View file

@ -103,7 +103,7 @@ static int query_fileowner(alpm_list_t *targets)
root = alpm_option_get_root(); root = alpm_option_get_root();
for(i = alpm_db_getpkgcache(db_local); i && !found; i = alpm_list_next(i)) { for(i = alpm_db_get_pkgcache(db_local); i && !found; i = alpm_list_next(i)) {
pmpkg_t *info = alpm_list_getdata(i); pmpkg_t *info = alpm_list_getdata(i);
for(j = alpm_pkg_get_files(info); j && !found; j = alpm_list_next(j)) { for(j = alpm_pkg_get_files(info); j && !found; j = alpm_list_next(j)) {
@ -154,7 +154,7 @@ static int query_search(alpm_list_t *targets)
searchlist = alpm_db_search(db_local, targets); searchlist = alpm_db_search(db_local, targets);
freelist = 1; freelist = 1;
} else { } else {
searchlist = alpm_db_getpkgcache(db_local); searchlist = alpm_db_get_pkgcache(db_local);
freelist = 0; freelist = 0;
} }
if(searchlist == NULL) { if(searchlist == NULL) {
@ -215,7 +215,7 @@ static int query_group(alpm_list_t *targets)
char *grpname = NULL; char *grpname = NULL;
int ret = 0; int ret = 0;
if(targets == NULL) { if(targets == NULL) {
for(j = alpm_db_getgrpcache(db_local); j; j = alpm_list_next(j)) { for(j = alpm_db_get_grpcache(db_local); j; j = alpm_list_next(j)) {
pmgrp_t *grp = alpm_list_getdata(j); pmgrp_t *grp = alpm_list_getdata(j);
const alpm_list_t *p, *packages; const alpm_list_t *p, *packages;
const char *grpname; const char *grpname;
@ -391,7 +391,7 @@ int pacman_query(alpm_list_t *targets)
return(1); return(1);
} }
for(i = alpm_db_getpkgcache(db_local); i; i = alpm_list_next(i)) { for(i = alpm_db_get_pkgcache(db_local); i; i = alpm_list_next(i)) {
pmpkg_t *pkg = alpm_list_getdata(i); pmpkg_t *pkg = alpm_list_getdata(i);
if(filter(pkg)) { if(filter(pkg)) {
display(pkg); display(pkg);

12
src/pacman/sync.c
View file

@ -286,7 +286,7 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets)
ret = alpm_db_search(db, targets); ret = alpm_db_search(db, targets);
freelist = 1; freelist = 1;
} else { } else {
ret = alpm_db_getpkgcache(db); ret = alpm_db_get_pkgcache(db);
freelist = 0; freelist = 0;
} }
if(ret == NULL) { if(ret == NULL) {
@ -371,7 +371,7 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets)
for(i = syncs; i; i = alpm_list_next(i)) { for(i = syncs; i; i = alpm_list_next(i)) {
pmdb_t *db = alpm_list_getdata(i); pmdb_t *db = alpm_list_getdata(i);
for(j = alpm_db_getgrpcache(db); j; j = alpm_list_next(j)) { for(j = alpm_db_get_grpcache(db); j; j = alpm_list_next(j)) {
pmgrp_t *grp = alpm_list_getdata(j); pmgrp_t *grp = alpm_list_getdata(j);
const char *grpname = alpm_grp_get_name(grp); const char *grpname = alpm_grp_get_name(grp);
@ -425,7 +425,7 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets)
return(1); return(1);
} }
for(k = alpm_db_getpkgcache(db); k; k = alpm_list_next(k)) { for(k = alpm_db_get_pkgcache(db); k; k = alpm_list_next(k)) {
pmpkg_t *pkg = alpm_list_getdata(k); pmpkg_t *pkg = alpm_list_getdata(k);
if(strcmp(alpm_pkg_get_name(pkg), pkgstr) == 0) { if(strcmp(alpm_pkg_get_name(pkg), pkgstr) == 0) {
@ -446,7 +446,7 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets)
for(j = syncs; j; j = alpm_list_next(j)) { for(j = syncs; j; j = alpm_list_next(j)) {
pmdb_t *db = alpm_list_getdata(j); pmdb_t *db = alpm_list_getdata(j);
for(k = alpm_db_getpkgcache(db); k; k = alpm_list_next(k)) { for(k = alpm_db_get_pkgcache(db); k; k = alpm_list_next(k)) {
pmpkg_t *pkg = alpm_list_getdata(k); pmpkg_t *pkg = alpm_list_getdata(k);
if(strcmp(alpm_pkg_get_name(pkg), pkgstr) == 0) { if(strcmp(alpm_pkg_get_name(pkg), pkgstr) == 0) {
@ -467,7 +467,7 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets)
for(i = syncs; i; i = alpm_list_next(i)) { for(i = syncs; i; i = alpm_list_next(i)) {
pmdb_t *db = alpm_list_getdata(i); pmdb_t *db = alpm_list_getdata(i);
for(j = alpm_db_getpkgcache(db); j; j = alpm_list_next(j)) { for(j = alpm_db_get_pkgcache(db); j; j = alpm_list_next(j)) {
dump_pkg_sync(alpm_list_getdata(j), alpm_db_get_name(db)); dump_pkg_sync(alpm_list_getdata(j), alpm_db_get_name(db));
} }
} }
@ -510,7 +510,7 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets)
for(i = ls; i; i = alpm_list_next(i)) { for(i = ls; i; i = alpm_list_next(i)) {
pmdb_t *db = alpm_list_getdata(i); pmdb_t *db = alpm_list_getdata(i);
for(j = alpm_db_getpkgcache(db); j; j = alpm_list_next(j)) { for(j = alpm_db_get_pkgcache(db); j; j = alpm_list_next(j)) {
pmpkg_t *pkg = alpm_list_getdata(j); pmpkg_t *pkg = alpm_list_getdata(j);
if (!config->quiet) { if (!config->quiet) {
printf("%s %s %s\n", alpm_db_get_name(db), alpm_pkg_get_name(pkg), printf("%s %s %s\n", alpm_db_get_name(db), alpm_pkg_get_name(pkg),

2
src/util/testdb.c
View file

@ -135,7 +135,7 @@ int main(int argc, char **argv)
/* check dependencies */ /* check dependencies */
alpm_list_t *data; alpm_list_t *data;
alpm_list_t *pkglist = alpm_db_getpkgcache(db); alpm_list_t *pkglist = alpm_db_get_pkgcache(db);
data = alpm_checkdeps(pkglist, 0, NULL, pkglist); data = alpm_checkdeps(pkglist, 0, NULL, pkglist);
for(i = data; i; i = alpm_list_next(i)) { for(i = data; i; i = alpm_list_next(i)) {
pmdepmissing_t *miss = alpm_list_getdata(i); pmdepmissing_t *miss = alpm_list_getdata(i);