Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=f552c57438e07e49caeade619f7be72fe9f49883
commit f552c57438e07e49caeade619f7be72fe9f49883 Author: Michel Hermier <[email protected]> Date: Thu Aug 14 20:12:21 2014 +0200 libpacman: s/Handle::getDatabase/Handle::createDatabase/ diff --git a/lib/libpacman/config_parser.cpp b/lib/libpacman/config_parser.cpp index 26527cd..1a7d981 100644 --- a/lib/libpacman/config_parser.cpp +++ b/lib/libpacman/config_parser.cpp @@ -87,7 +87,7 @@ int _pacman_parse_config(Handle *handle, const char *file, pacman_cb_db_register RET_ERR(PM_ERR_CONF_LOCAL, -1); } if(strcmp(section, "options")) { - db = handle->getDatabase(section, callback); + db = handle->createDatabase(section, callback); } } else { FREELIST(handle->ignorepkg); @@ -117,7 +117,7 @@ int _pacman_parse_config(Handle *handle, const char *file, pacman_cb_db_register RET_ERR(PM_ERR_CONF_LOCAL, -1); } if(strcmp(section, "options")) { - db = handle->getDatabase(section, callback); + db = handle->createDatabase(section, callback); if(db == NULL) { /* pm_errno is set by pacman_db_register */ return(-1); diff --git a/lib/libpacman/handle.cpp b/lib/libpacman/handle.cpp index 986acdd..fe8aec8 100644 --- a/lib/libpacman/handle.cpp +++ b/lib/libpacman/handle.cpp @@ -135,7 +135,7 @@ int Handle::unlock() return ret; } -Database *Handle::getDatabase(const char *treename, pacman_cb_db_register callback) +Database *Handle::createDatabase(const char *treename, pacman_cb_db_register callback) { Database *db; diff --git a/lib/libpacman/handle.h b/lib/libpacman/handle.h index 802f49c..3dfd6d2 100644 --- a/lib/libpacman/handle.h +++ b/lib/libpacman/handle.h @@ -56,7 +56,7 @@ public: int lock(); int unlock(); - libpacman::Database *getDatabase(const char *treename, pacman_cb_db_register callback); + libpacman::Database *createDatabase(const char *treename, pacman_cb_db_register callback); pmaccess_t access; uid_t uid; diff --git a/lib/libpacman/pacman.cpp b/lib/libpacman/pacman.cpp index ec2f134..ed8dbcd 100644 --- a/lib/libpacman/pacman.cpp +++ b/lib/libpacman/pacman.cpp @@ -402,7 +402,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 c_cast(handle->getDatabase(treename, NULL)); + return c_cast(handle->createDatabase(treename, NULL)); } /** Unregister a package database _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
