Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=fd0e62f2c4d36c35590ac15e38bc4f5c1e98f87c
commit fd0e62f2c4d36c35590ac15e38bc4f5c1e98f87c Author: Michel Hermier <[email protected]> Date: Sat Nov 9 12:25:07 2013 +0100 libpacman: Move stub functions from be_files.c to db.c. diff --git a/lib/libpacman/be_files.c b/lib/libpacman/be_files.c index c1510dc..e8b6ce9 100644 --- a/lib/libpacman/be_files.c +++ b/lib/libpacman/be_files.c @@ -59,41 +59,6 @@ static inline int islocal(pmdb_t *db) return strcmp(db->treename, "local") == 0; } -pmlist_t *_pacman_db_test(pmdb_t *db) -{ - ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, NULL)); - - return db->ops->test(db); -} - -int _pacman_db_open(pmdb_t *db) -{ - int ret = 0; - - ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); - - ret = db->ops->open(db); - if(ret == 0 && _pacman_db_getlastupdate(db, db->lastupdate) == -1) { - db->lastupdate[0] = '\0'; - } - - return ret; -} - -int _pacman_db_close(pmdb_t *db) -{ - ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); - - return db->ops->close(db); -} - -int _pacman_db_rewind(pmdb_t *db) -{ - ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); - - return db->ops->rewind(db); -} - pmpkg_t *_pacman_db_scan(pmdb_t *db, const char *target, unsigned int inforeq) { struct dirent *ent = NULL; diff --git a/lib/libpacman/db.c b/lib/libpacman/db.c index be74caf..8ba2d8e 100644 --- a/lib/libpacman/db.c +++ b/lib/libpacman/db.c @@ -155,6 +155,41 @@ pmlist_t *_pacman_db_search(pmdb_t *db, pmlist_t *needles) return(ret); } +pmlist_t *_pacman_db_test(pmdb_t *db) +{ + ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, NULL)); + + return db->ops->test(db); +} + +int _pacman_db_open(pmdb_t *db) +{ + int ret = 0; + + ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); + + ret = db->ops->open(db); + if(ret == 0 && _pacman_db_getlastupdate(db, db->lastupdate) == -1) { + db->lastupdate[0] = '\0'; + } + + return ret; +} + +int _pacman_db_close(pmdb_t *db) +{ + ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); + + return db->ops->close(db); +} + +int _pacman_db_rewind(pmdb_t *db) +{ + ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); + + return db->ops->rewind(db); +} + pmdb_t *_pacman_db_register(const char *treename, pacman_cb_db_register callback) { struct stat buf; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
