Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=0ccd01abfab2fa9261b7be1e301c17bf6593e438
commit 0ccd01abfab2fa9261b7be1e301c17bf6593e438
Author: Michel Hermier <herm...@frugalware.org>
Date: Sat Nov 9 16:43:01 2013 +0100
libpacman: Move _pacman_db_read to db.c.
diff --git a/lib/libpacman/be_files.c b/lib/libpacman/be_files.c
index 4452a56..bc78a84 100644
--- a/lib/libpacman/be_files.c
+++ b/lib/libpacman/be_files.c
@@ -185,22 +185,6 @@ pmpkg_t *_pacman_db_scan(pmdb_t *db, const char *target,
unsigned int inforeq)
return(pkg);
}
-int _pacman_db_read(pmdb_t *db, unsigned int inforeq, pmpkg_t *info)
-{
- int ret;
-
- ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
- if(info == NULL || info->name[0] == 0 || info->version[0] == 0) {
- _pacman_log(PM_LOG_ERROR, _("invalid package entry provided to
_pacman_db_read"));
- return(-1);
- }
-
- if((ret = db->ops->read(db, info, inforeq)) == 0) {
- info->infolevel |= inforeq;
- }
- return ret;
-}
-
/* reads dbpath/.lastupdate and populates *ts with the contents.
* *ts should be malloc'ed and should be at least 15 bytes.
*
diff --git a/lib/libpacman/db.c b/lib/libpacman/db.c
index 54bb25f..49de7e9 100644
--- a/lib/libpacman/db.c
+++ b/lib/libpacman/db.c
@@ -190,6 +190,22 @@ int _pacman_db_rewind(pmdb_t *db)
return db->ops->rewind(db);
}
+int _pacman_db_read(pmdb_t *db, unsigned int inforeq, pmpkg_t *info)
+{
+ int ret;
+
+ ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
+ if(info == NULL || info->name[0] == 0 || info->version[0] == 0) {
+ _pacman_log(PM_LOG_ERROR, _("invalid package entry provided to
_pacman_db_read"));
+ return(-1);
+ }
+
+ if((ret = db->ops->read(db, info, inforeq)) == 0) {
+ info->infolevel |= inforeq;
+ }
+ return ret;
+}
+
int _pacman_db_write(pmdb_t *db, pmpkg_t *info, unsigned int inforeq)
{
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
