Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=ea512f556c68e0b6ec11701bfa92eaeb2334cab5
commit ea512f556c68e0b6ec11701bfa92eaeb2334cab5 Author: Michel Hermier <[email protected]> Date: Sat Jun 8 10:00:34 2013 +0200 libpacman: Remove pacman_cb_db_register. diff --git a/doc/libpacman-changes.txt b/doc/libpacman-changes.txt index cebf2df..f63f57a 100644 --- a/doc/libpacman-changes.txt +++ b/doc/libpacman-changes.txt @@ -22,6 +22,8 @@ A new private (for now) library that abstract some of the usual API a 'C' progra PM_LIST is now a flib FList meaning that pacman_list(3) API will be deprecated when FLib will be stabilized. +pacman_parse_config: Do not take the pacman_cb_db_register callback argument, it's only purpose was to fill up a list of PM_DB while we can allways get it with pacman_get_option (PM_OPT_SYNCDB, ...). + ==== Symbols added: PM_PKG_DATABASE: New package data accessor. @@ -33,6 +35,8 @@ PM_PKG_DATA, PM_SYNC_DATA: These data accessors provided ambiguity in the API, r PM_SYNC_TYPE_REPLACE, PM_SYNC_TYPE_UPGRADE, PM_SYNC_TYPE_DEPEND: One should use the PM_TRANS_TYPE_* equivalent instead. +pacman_cb_db_register: Remove as unused, see pacman_parse_config symbol change. + pacman_pkg_checkmd5sum, pacman_pkg_checksha1sum: Unused and broken since a while and nobody noticed it, so it is unused (can can be easily replaced by other means). === Behaviour changes diff --git a/lib/libpacman/db.c b/lib/libpacman/db.c index e33d7f5..7d81ceb 100644 --- a/lib/libpacman/db.c +++ b/lib/libpacman/db.c @@ -138,7 +138,7 @@ pmlist_t *_pacman_db_search(pmdb_t *db, pmlist_t *needles) return(ret); } -pmdb_t *_pacman_db_register(const char *treename, pacman_cb_db_register callback) +pmdb_t *_pacman_db_register(const char *treename) { struct stat buf; pmdb_t *db; @@ -183,9 +183,6 @@ pmdb_t *_pacman_db_register(const char *treename, pacman_cb_db_register callback RET_ERR(PM_ERR_DB_OPEN, NULL); } - /* Only call callback on NEW registration. */ - if(callback) callback(treename, db); - if(strcmp(treename, "local") == 0) { handle->db_local = db; } else { diff --git a/lib/libpacman/db.h b/lib/libpacman/db.h index bbef899..48c9453 100644 --- a/lib/libpacman/db.h +++ b/lib/libpacman/db.h @@ -64,7 +64,7 @@ int _pacman_db_write(pmdb_t *db, pmpkg_t *info, unsigned int inforeq); int _pacman_db_remove(pmdb_t *db, pmpkg_t *info); int _pacman_db_getlastupdate(pmdb_t *db, char *ts); int _pacman_db_setlastupdate(pmdb_t *db, char *ts); -pmdb_t *_pacman_db_register(const char *treename, pacman_cb_db_register callback); +pmdb_t *_pacman_db_register(const char *treename); #endif /* _PACMAN_DB_H */ diff --git a/lib/libpacman/pacman.c b/lib/libpacman/pacman.c index 0e371e5..8a2ed78 100644 --- a/lib/libpacman/pacman.c +++ b/lib/libpacman/pacman.c @@ -176,7 +176,7 @@ pmdb_t *pacman_db_register(const char *treename) /* Do not register a database if a transaction is on-going */ ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, NULL)); - return(_pacman_db_register(treename, NULL)); + return(_pacman_db_register(treename)); } /** Unregister a package database @@ -1042,11 +1042,10 @@ int pacman_reg_match(const char *string, const char *pattern) /** Parses a configuration file. * @param file path to the config file. - * @param callback a function to be called upon new database creation * @param this_section the config current section being parsed * @return 0 on success, -1 on error (pm_errno is set accordingly) */ -int pacman_parse_config(char *file, pacman_cb_db_register callback, const char *this_section) +int pacman_parse_config(char *file, const char *this_section) { FILE *fp = NULL; char line[PATH_MAX+1]; @@ -1070,7 +1069,7 @@ int pacman_parse_config(char *file, pacman_cb_db_register callback, const char * RET_ERR(PM_ERR_CONF_LOCAL, -1); } if(strcmp(section, "options")) { - db = _pacman_db_register(section, callback); + db = _pacman_db_register(section); } } else { FREELIST(handle->ignorepkg); @@ -1100,7 +1099,7 @@ int pacman_parse_config(char *file, pacman_cb_db_register callback, const char * RET_ERR(PM_ERR_CONF_LOCAL, -1); } if(strcmp(section, "options")) { - db = _pacman_db_register(section, callback); + db = _pacman_db_register(section); if(db == NULL) { /* pm_errno is set by pacman_db_register */ return(-1); @@ -1135,7 +1134,7 @@ int pacman_parse_config(char *file, pacman_cb_db_register callback, const char * char conf[PATH_MAX]; strncpy(conf, ptr, PATH_MAX); _pacman_log(PM_LOG_DEBUG, _("config: including %s\n"), conf); - pacman_parse_config(conf, callback, section); + pacman_parse_config(conf, section); } else if(!strcmp(section, "options")) { if(!strcmp(key, "NOUPGRADE")) { char *p = ptr; diff --git a/lib/libpacman/pacman.h b/lib/libpacman/pacman.h index 209e247..ea138b3 100644 --- a/lib/libpacman/pacman.h +++ b/lib/libpacman/pacman.h @@ -140,9 +140,6 @@ enum { PM_DB_FIRSTSERVER }; -/* Database registration callback */ -typedef void (*pacman_cb_db_register)(const char *, PM_DB *); - PM_DB *pacman_db_register(const char *treename); int pacman_db_unregister(PM_DB *db); @@ -214,7 +211,7 @@ PM_LIST *pacman_pkg_getowners(char *filename); int pacman_pkg_load(char *filename, PM_PKG **pkg); int pacman_pkg_free(PM_PKG *pkg); char *pacman_fetch_pkgurl(char *url); -int pacman_parse_config(char *file, pacman_cb_db_register callback, const char *this_section); +int pacman_parse_config(char *file, const char *this_section); int pacman_pkg_vercmp(const char *ver1, const char *ver2); int pacman_reg_match(const char *string, const char *pattern); diff --git a/src/pacman-g2/pacman-g2.c b/src/pacman-g2/pacman-g2.c index 0141784..613fc9f 100644 --- a/src/pacman-g2/pacman-g2.c +++ b/src/pacman-g2/pacman-g2.c @@ -558,7 +558,7 @@ int main(int argc, char *argv[]) if(config->configfile == NULL) { config->configfile = strdup(PACCONF); } - if(pacman_parse_config(config->configfile, NULL, "") != 0) { + if(pacman_parse_config(config->configfile, "") != 0) { ERR(NL, _("failed to parse config (%s)\n"), pacman_strerror(pm_errno)); cleanup(1); } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
