Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=eaab96c8f35b6762cea454ae453ce681e0bb8b1e
commit eaab96c8f35b6762cea454ae453ce681e0bb8b1e Author: Michel Hermier <[email protected]> Date: Sun Jun 8 11:27:53 2014 +0200 libpacman: Remove one global handle usage in _pacman_parse_config. diff --git a/lib/libpacman/config_parser.cpp b/lib/libpacman/config_parser.cpp index e6d2e73..26527cd 100644 --- a/lib/libpacman/config_parser.cpp +++ b/lib/libpacman/config_parser.cpp @@ -63,7 +63,7 @@ using namespace libpacman; -int _pacman_parse_config(const char *file, pacman_cb_db_register callback, const char *this_section) +int _pacman_parse_config(Handle *handle, const char *file, pacman_cb_db_register callback, const char *this_section) { FILE *fp = NULL; char line[PATH_MAX+1]; @@ -152,7 +152,7 @@ int _pacman_parse_config(const char *file, pacman_cb_db_register callback, const 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(handle, conf, callback, section); } else if(!strcmp(section, "options")) { if(!strcmp(key, "NOUPGRADE")) { char *p = ptr; diff --git a/lib/libpacman/config_parser.h b/lib/libpacman/config_parser.h index 440e2b6..96d662c 100644 --- a/lib/libpacman/config_parser.h +++ b/lib/libpacman/config_parser.h @@ -26,7 +26,9 @@ #include "pacman.h" -int _pacman_parse_config(const char *file, pacman_cb_db_register callback, const char *this_section); +#include "handle.h" + +int _pacman_parse_config(::libpacman::Handle *handle, const char *file, pacman_cb_db_register callback, const char *this_section); #endif /* _PACMAN_CONFIG_PARSER_H */ diff --git a/lib/libpacman/pacman.cpp b/lib/libpacman/pacman.cpp index eac749b..4bc39ef 100644 --- a/lib/libpacman/pacman.cpp +++ b/lib/libpacman/pacman.cpp @@ -1406,7 +1406,7 @@ int pacman_parse_config(const char *file, pacman_cb_db_register callback) { ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); - return _pacman_parse_config(file, callback, NULL); + return _pacman_parse_config(handle, file, callback, NULL); } /* @} */ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
