Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=f47ef18f3418d34d69fdc0e2cfe430bad7c40794
commit f47ef18f3418d34d69fdc0e2cfe430bad7c40794 Author: Michel Hermier <[email protected]> Date: Sat Nov 9 12:18:29 2013 +0100 libpacman: Add and use pmdb_ops_t. diff --git a/lib/libpacman/be_files.c b/lib/libpacman/be_files.c index 9a344a4..c1510dc 100644 --- a/lib/libpacman/be_files.c +++ b/lib/libpacman/be_files.c @@ -63,10 +63,7 @@ pmlist_t *_pacman_db_test(pmdb_t *db) { ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, NULL)); - if (islocal(db)) - return _pacman_localdb_test(db); - else - return _pacman_syncdb_test(db); + return db->ops->test(db); } int _pacman_db_open(pmdb_t *db) @@ -75,11 +72,7 @@ int _pacman_db_open(pmdb_t *db) ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); - if (islocal(db)) { - ret = _pacman_localdb_open(db); - } else { - ret = _pacman_syncdb_open(db); - } + ret = db->ops->open(db); if(ret == 0 && _pacman_db_getlastupdate(db, db->lastupdate) == -1) { db->lastupdate[0] = '\0'; } @@ -91,20 +84,14 @@ int _pacman_db_close(pmdb_t *db) { ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); - if (islocal(db)) - return _pacman_localdb_close(db); - else - return _pacman_syncdb_close(db); + return db->ops->close(db); } int _pacman_db_rewind(pmdb_t *db) { ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); - if (islocal(db)) - return _pacman_localdb_rewind(db); - else - return _pacman_syncdb_rewind(db); + return db->ops->rewind(db); } pmpkg_t *_pacman_db_scan(pmdb_t *db, const char *target, unsigned int inforeq) diff --git a/lib/libpacman/db.c b/lib/libpacman/db.c index dc13d9d..be74caf 100644 --- a/lib/libpacman/db.c +++ b/lib/libpacman/db.c @@ -44,6 +44,8 @@ /* pacman-g2 */ #include "db.h" +#include "db/localdb.h" +#include "db/syncdb.h" #include "util/list.h" #include "util/log.h" #include "util.h" @@ -190,6 +192,11 @@ pmdb_t *_pacman_db_register(const char *treename, pacman_cb_db_register callback if(db == NULL) { RET_ERR(PM_ERR_DB_CREATE, NULL); } + if(strcmp(treename, "local") == 0) { + db->ops = &_pacman_localdb_ops; + } else { + db->ops = &_pacman_syncdb_ops; + } _pacman_log(PM_LOG_DEBUG, _("opening database '%s'"), db->treename); if(_pacman_db_open(db) == -1) { diff --git a/lib/libpacman/db.h b/lib/libpacman/db.h index 6114059..b4c39bb 100644 --- a/lib/libpacman/db.h +++ b/lib/libpacman/db.h @@ -37,8 +37,20 @@ #define DB_O_CREATE 0x01 +typedef struct __pmdb_ops_t pmdb_ops_t; + +struct __pmdb_ops_t { + int (*test)(pmdb_t *db); + int (*open)(pmdb_t *db); + int (*close)(pmdb_t *db); + + /* Package iterator */ + int (*rewind)(pmdb_t *db); +}; + /* Database */ struct __pmdb_t { + const pmdb_ops_t *ops; char *path; char treename[PATH_MAX]; void *handle; diff --git a/lib/libpacman/db/localdb.c b/lib/libpacman/db/localdb.c index d3e8b27..1236560 100644 --- a/lib/libpacman/db/localdb.c +++ b/lib/libpacman/db/localdb.c @@ -49,6 +49,7 @@ #include "error.h" #include "handle.h" +static pmlist_t *_pacman_localdb_test(pmdb_t *db) { struct dirent *ent; @@ -85,6 +86,7 @@ pmlist_t *_pacman_localdb_test(pmdb_t *db) return(ret); } +static int _pacman_localdb_open(pmdb_t *db) { db->handle = opendir(db->path); @@ -93,6 +95,7 @@ int _pacman_localdb_open(pmdb_t *db) return 0; } +static int _pacman_localdb_close(pmdb_t *db) { if(db->handle) { @@ -102,6 +105,7 @@ int _pacman_localdb_close(pmdb_t *db) return 0; } +static int _pacman_localdb_rewind(pmdb_t *db) { if(db->handle == NULL) { @@ -237,4 +241,11 @@ cleanup: return(retval); } +const pmdb_ops_t _pacman_localdb_ops = { + .test = _pacman_localdb_test, + .open = _pacman_localdb_open, + .close = _pacman_localdb_close, + .rewind = _pacman_localdb_rewind, +}; + /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libpacman/db/localdb.h b/lib/libpacman/db/localdb.h index aa73036..156f871 100644 --- a/lib/libpacman/db/localdb.h +++ b/lib/libpacman/db/localdb.h @@ -23,12 +23,10 @@ #include "db.h" -pmlist_t *_pacman_localdb_test(pmdb_t *db); -int _pacman_localdb_open(pmdb_t *db); -int _pacman_localdb_close(pmdb_t *db); -int _pacman_localdb_rewind(pmdb_t *db); int _pacman_localdb_write(pmdb_t *db, pmpkg_t *info, unsigned int inforeq); +const pmdb_ops_t _pacman_localdb_ops; + #endif /* _PACMAN_LOCALDB_H */ /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libpacman/db/syncdb.c b/lib/libpacman/db/syncdb.c index 7e90047..acd5084 100644 --- a/lib/libpacman/db/syncdb.c +++ b/lib/libpacman/db/syncdb.c @@ -49,12 +49,14 @@ #include "error.h" #include "handle.h" +static pmlist_t *_pacman_syncdb_test(pmdb_t *db) { /* testing sync dbs is not supported */ return _pacman_list_new(); } +static int _pacman_syncdb_open(pmdb_t *db) { char dbpath[PATH_MAX]; @@ -77,6 +79,7 @@ int _pacman_syncdb_open(pmdb_t *db) return 0; } +static int _pacman_syncdb_close(pmdb_t *db) { if(db->handle) { @@ -86,6 +89,7 @@ int _pacman_syncdb_close(pmdb_t *db) return 0; } +static int _pacman_syncdb_rewind(pmdb_t *db) { char dbpath[PATH_MAX]; @@ -103,4 +107,11 @@ int _pacman_syncdb_rewind(pmdb_t *db) return 0; } +const pmdb_ops_t _pacman_syncdb_ops = { + .test = _pacman_syncdb_test, + .open = _pacman_syncdb_open, + .close = _pacman_syncdb_close, + .rewind = _pacman_syncdb_rewind, +}; + /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libpacman/db/syncdb.h b/lib/libpacman/db/syncdb.h index bc64282..47f3c30 100644 --- a/lib/libpacman/db/syncdb.h +++ b/lib/libpacman/db/syncdb.h @@ -23,10 +23,7 @@ #include "db.h" -pmlist_t *_pacman_syncdb_test(pmdb_t *db); -int _pacman_syncdb_open(pmdb_t *db); -int _pacman_syncdb_close(pmdb_t *db); -int _pacman_syncdb_rewind(pmdb_t *db); +const pmdb_ops_t _pacman_syncdb_ops; #endif /* _PACMAN_SYNCDB_H */ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
