Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=1c7fbbe47f5b6599c5e4ac46b84f41aa881773f8
commit 1c7fbbe47f5b6599c5e4ac46b84f41aa881773f8
Author: Michel Hermier <herm...@frugalware.org>
Date: Mon Dec 9 23:52:58 2013 +0100
libpacman: Reorder _pacman_db_read arguments so they match other functions.
diff --git a/lib/libpacman/add.c b/lib/libpacman/add.c
index d9abfdb..7cec716 100644
--- a/lib/libpacman/add.c
+++ b/lib/libpacman/add.c
@@ -290,7 +290,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data)
if(oldpkg) {
if(!(pkg_local->infolevel & INFRQ_FILES)) {
_pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), pkg_local->name);
- _pacman_db_read(db_local,
INFRQ_FILES, pkg_local);
+ _pacman_db_read(db_local,
pkg_local, INFRQ_FILES);
}
oldpkg->backup = _pacman_list_strdup(pkg_local->backup);
strncpy(oldpkg->name, pkg_local->name, PKG_NAME_LEN);
diff --git a/lib/libpacman/cache.c b/lib/libpacman/cache.c
index cece58a..cb41cdf 100644
--- a/lib/libpacman/cache.c
+++ b/lib/libpacman/cache.c
@@ -198,7 +198,7 @@ int _pacman_db_load_grpcache(pmdb_t *db)
pmpkg_t *pkg = lp->data;
if(!(pkg->infolevel & INFRQ_DESC)) {
- _pacman_db_read(pkg->data, INFRQ_DESC, pkg);
+ _pacman_db_read(pkg->data, pkg, INFRQ_DESC);
}
for(i = pkg->groups; i; i = i->next) {
diff --git a/lib/libpacman/conflict.c b/lib/libpacman/conflict.c
index 75bec57..953aacc 100644
--- a/lib/libpacman/conflict.c
+++ b/lib/libpacman/conflict.c
@@ -322,7 +322,7 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans, char
*root, pmlist_t **ski
}
if(dbpkg && !(dbpkg->infolevel & INFRQ_FILES)) {
_pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), dbpkg->name);
- _pacman_db_read(db_local,
INFRQ_FILES, dbpkg);
+ _pacman_db_read(db_local,
dbpkg, INFRQ_FILES);
}
if(dbpkg && _pacman_list_is_strin(j->data, dbpkg->files)) {
ok = 1;
@@ -338,7 +338,7 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans, char
*root, pmlist_t **ski
dbpkg2 = _pacman_db_get_pkgfromcache(db_local, p2->name);
if(dbpkg2 && !(dbpkg2->infolevel & INFRQ_FILES)) {
_pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), dbpkg2->name);
-
_pacman_db_read(db_local, INFRQ_FILES, dbpkg2);
+
_pacman_db_read(db_local, dbpkg2, INFRQ_FILES);
}
/* If it used to exist in there, but doesn't anymore */
if(dbpkg2 && !_pacman_list_is_strin(filestr, p2->files) &&
_pacman_list_is_strin(filestr, dbpkg2->files)) {
diff --git a/lib/libpacman/db.c b/lib/libpacman/db.c
index e96ec4e..53312fa 100644
--- a/lib/libpacman/db.c
+++ b/lib/libpacman/db.c
@@ -242,7 +242,7 @@ pmpkg_t *_pacman_db_scan(pmdb_t *db, const char *target,
unsigned int inforeq)
return db->ops->scan(db, target, inforeq);
}
-int _pacman_db_read(pmdb_t *db, unsigned int inforeq, pmpkg_t *info)
+int _pacman_db_read(pmdb_t *db, pmpkg_t *info, unsigned int inforeq)
{
int ret;
diff --git a/lib/libpacman/db.h b/lib/libpacman/db.h
index 491053d..b78d187 100644
--- a/lib/libpacman/db.h
+++ b/lib/libpacman/db.h
@@ -81,7 +81,7 @@ int _pacman_db_settimestamp(pmdb_t *db, const time_t
*timestamp);
int _pacman_db_rewind(pmdb_t *db);
pmpkg_t *_pacman_db_readpkg(pmdb_t *db, unsigned int inforeq);
pmpkg_t *_pacman_db_scan(pmdb_t *db, const char *target, unsigned int inforeq);
-int _pacman_db_read(pmdb_t *db, unsigned int inforeq, pmpkg_t *info);
+int _pacman_db_read(pmdb_t *db, pmpkg_t *info, unsigned int inforeq);
int _pacman_db_write(pmdb_t *db, pmpkg_t *info, unsigned int inforeq);
int _pacman_db_remove(pmdb_t *db, pmpkg_t *info);
pmdb_t *_pacman_db_register(const char *treename, pacman_cb_db_register
callback);
diff --git a/lib/libpacman/db/localdb.c b/lib/libpacman/db/localdb.c
index 2206c2d..5ef540e 100644
--- a/lib/libpacman/db/localdb.c
+++ b/lib/libpacman/db/localdb.c
@@ -62,7 +62,7 @@ pmpkg_t *_pacman_localdb_pkg_new(pmdb_t *db, const struct
dirent *dirent, unsign
dname = dirent->d_name;
if((pkg = _pacman_pkg_new_from_filename(dname, 0)) == NULL ||
- _pacman_db_read(db, inforeq, pkg) == -1) {
+ _pacman_db_read(db, pkg, inforeq) == -1) {
_pacman_log(PM_LOG_ERROR, _("invalid name for dabatase entry '%s'"), dname);
FREEPKG(pkg);
}
diff --git a/lib/libpacman/db/syncdb.c b/lib/libpacman/db/syncdb.c
index 4610736..9120a5b 100644
--- a/lib/libpacman/db/syncdb.c
+++ b/lib/libpacman/db/syncdb.c
@@ -77,7 +77,7 @@ pmpkg_t *_pacman_syncdb_pkg_new(pmdb_t *db, const struct
archive_entry *entry, u
dname = archive_entry_pathname((struct archive_entry *)entry);
if((pkg = _pacman_pkg_new_from_filename(dname, 0)) == NULL ||
- _pacman_db_read(db, inforeq, pkg) == -1) {
+ _pacman_db_read(db, pkg, inforeq) == -1) {
_pacman_log(PM_LOG_ERROR, _("invalid name for dabatase entry '%s'"), dname);
FREEPKG(pkg);
}
diff --git a/lib/libpacman/deps.c b/lib/libpacman/deps.c
index 5d86149..c51ce64 100644
--- a/lib/libpacman/deps.c
+++ b/lib/libpacman/deps.c
@@ -552,7 +552,7 @@ pmlist_t *_pacman_removedeps(pmdb_t *db, pmlist_t *targs)
}
/* add it to the target list */
_pacman_log(PM_LOG_DEBUG, _("loading ALL info for '%s'"), pkg->name);
- _pacman_db_read(db, INFRQ_ALL, pkg);
+ _pacman_db_read(db, pkg, INFRQ_ALL);
newtargs = _pacman_list_add(newtargs, pkg);
_pacman_log(PM_LOG_FLOW2, _("adding '%s' to the targets"), pkg->name);
newtargs = _pacman_removedeps(db, newtargs);
diff --git a/lib/libpacman/package.c b/lib/libpacman/package.c
index 7848c57..acbafe5 100644
--- a/lib/libpacman/package.c
+++ b/lib/libpacman/package.c
@@ -391,7 +391,7 @@ void *_pacman_pkg_getinfo(pmpkg_t *pkg, unsigned char parm)
case PM_PKG_FORCE:
if(!(pkg->infolevel & INFRQ_DESC)) {
_pacman_log(PM_LOG_DEBUG, _("loading DESC info for '%s'"), pkg->name);
- _pacman_db_read(pkg->data, INFRQ_DESC,
pkg);
+ _pacman_db_read(pkg->data, pkg,
INFRQ_DESC);
}
break;
/* Depends entry */
@@ -401,7 +401,7 @@ void *_pacman_pkg_getinfo(pmpkg_t *pkg, unsigned char parm)
case PM_PKG_PROVIDES:
if(!(pkg->infolevel & INFRQ_DEPENDS)) {
_pacman_log(PM_LOG_DEBUG, "loading DEPENDS info for '%s'", pkg->name);
- _pacman_db_read(pkg->data,
INFRQ_DEPENDS, pkg);
+ _pacman_db_read(pkg->data, pkg,
INFRQ_DEPENDS);
}
break;
/* Files entry */
@@ -409,14 +409,14 @@ void *_pacman_pkg_getinfo(pmpkg_t *pkg, unsigned char
parm)
case PM_PKG_BACKUP:
if(pkg->data == handle->db_local && !(pkg->infolevel & INFRQ_FILES)) {
_pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), pkg->name);
- _pacman_db_read(pkg->data, INFRQ_FILES,
pkg);
+ _pacman_db_read(pkg->data, pkg,
INFRQ_FILES);
}
break;
/* Scriptlet */
case PM_PKG_SCRIPLET:
if(pkg->data == handle->db_local && !(pkg->infolevel & INFRQ_SCRIPLET)) {
_pacman_log(PM_LOG_DEBUG, _("loading SCRIPLET info for '%s'"), pkg->name);
- _pacman_db_read(pkg->data,
INFRQ_SCRIPLET, pkg);
+ _pacman_db_read(pkg->data, pkg,
INFRQ_SCRIPLET);
}
break;
}
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
