Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=65a0dccd2fb03a6d63c8c344ed44a224129ca7f4
commit 65a0dccd2fb03a6d63c8c344ed44a224129ca7f4 Author: Michel Hermier <[email protected]> Date: Sat Nov 9 13:58:58 2013 +0100 libpacman: Move _pacman_db_write and _pacman_db_remove to db.c. diff --git a/lib/libpacman/be_files.c b/lib/libpacman/be_files.c index 9b78191..4f398fa 100644 --- a/lib/libpacman/be_files.c +++ b/lib/libpacman/be_files.c @@ -508,30 +508,6 @@ error: return(-1); } -int _pacman_db_write(pmdb_t *db, pmpkg_t *info, unsigned int inforeq) -{ - ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); - ASSERT(info != NULL, RET_ERR(PM_ERR_PKG_INVALID, -1)); - - if(db->ops->write != NULL) { - return db->ops->write(db, info, inforeq); - } else { - RET_ERR(PM_ERR_WRONG_ARGS, -1); // Not supported - } -} - -int _pacman_db_remove(pmdb_t *db, pmpkg_t *info) -{ - ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); - ASSERT(info != NULL, RET_ERR(PM_ERR_PKG_INVALID, -1)); - - if(db->ops->remove != NULL) { - return db->ops->remove(db, info); - } else { - RET_ERR(PM_ERR_WRONG_ARGS, -1); // Not supported - } -} - /* 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 8ba2d8e..54bb25f 100644 --- a/lib/libpacman/db.c +++ b/lib/libpacman/db.c @@ -190,6 +190,30 @@ int _pacman_db_rewind(pmdb_t *db) return db->ops->rewind(db); } +int _pacman_db_write(pmdb_t *db, pmpkg_t *info, unsigned int inforeq) +{ + ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); + ASSERT(info != NULL, RET_ERR(PM_ERR_PKG_INVALID, -1)); + + if(db->ops->write != NULL) { + return db->ops->write(db, info, inforeq); + } else { + RET_ERR(PM_ERR_WRONG_ARGS, -1); // Not supported + } +} + +int _pacman_db_remove(pmdb_t *db, pmpkg_t *info) +{ + ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); + ASSERT(info != NULL, RET_ERR(PM_ERR_PKG_INVALID, -1)); + + if(db->ops->remove != NULL) { + return db->ops->remove(db, info); + } else { + RET_ERR(PM_ERR_WRONG_ARGS, -1); // Not supported + } +} + 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
