Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=2533c72712bfd95a54296ee47d956bbebfb7620c
commit 2533c72712bfd95a54296ee47d956bbebfb7620c Author: Michel Hermier <[email protected]> Date: Sat Nov 9 12:51:18 2013 +0100 libpacman: Stub _pacman_db_write operations. diff --git a/lib/libpacman/be_files.c b/lib/libpacman/be_files.c index e8b6ce9..7c7dcc4 100644 --- a/lib/libpacman/be_files.c +++ b/lib/libpacman/be_files.c @@ -511,14 +511,12 @@ error: int _pacman_db_write(pmdb_t *db, pmpkg_t *info, unsigned int inforeq) { ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); - if(info == NULL) { - return(-1); - } + ASSERT(info != NULL, RET_ERR(PM_ERR_PKG_INVALID, -1)); - if(islocal(db)) { - return _pacman_localdb_write(db, info, inforeq); + if(db->ops->write != NULL) { + return db->ops->write(db, info, inforeq); } else { - RET_ERR(PM_ERR_WRONG_ARGS, -1); // Not supported anymore + RET_ERR(PM_ERR_WRONG_ARGS, -1); // Not supported } } diff --git a/lib/libpacman/db.h b/lib/libpacman/db.h index b4c39bb..3495956 100644 --- a/lib/libpacman/db.h +++ b/lib/libpacman/db.h @@ -46,6 +46,8 @@ struct __pmdb_ops_t { /* Package iterator */ int (*rewind)(pmdb_t *db); + + int (*write)(pmdb_t *db, pmpkg_t *info, unsigned int inforeq); /* Optional */ }; /* Database */ diff --git a/lib/libpacman/db/localdb.c b/lib/libpacman/db/localdb.c index 1236560..5862b1e 100644 --- a/lib/libpacman/db/localdb.c +++ b/lib/libpacman/db/localdb.c @@ -246,6 +246,7 @@ const pmdb_ops_t _pacman_localdb_ops = { .open = _pacman_localdb_open, .close = _pacman_localdb_close, .rewind = _pacman_localdb_rewind, + .write = _pacman_localdb_write, }; /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libpacman/db/localdb.h b/lib/libpacman/db/localdb.h index 156f871..133802e 100644 --- a/lib/libpacman/db/localdb.h +++ b/lib/libpacman/db/localdb.h @@ -23,8 +23,6 @@ #include "db.h" -int _pacman_localdb_write(pmdb_t *db, pmpkg_t *info, unsigned int inforeq); - const pmdb_ops_t _pacman_localdb_ops; #endif /* _PACMAN_LOCALDB_H */ diff --git a/lib/libpacman/db/syncdb.c b/lib/libpacman/db/syncdb.c index acd5084..bdeff6d 100644 --- a/lib/libpacman/db/syncdb.c +++ b/lib/libpacman/db/syncdb.c @@ -112,6 +112,7 @@ const pmdb_ops_t _pacman_syncdb_ops = { .open = _pacman_syncdb_open, .close = _pacman_syncdb_close, .rewind = _pacman_syncdb_rewind, + .write = NULL, }; /* vim: set ts=2 sw=2 noet: */ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
