Module: sems Branch: master Commit: ea94576e030cc53e3b4f912040dee9e7ec230651 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=ea94576e030cc53e3b4f912040dee9e7ec230651
Author: Stefan Sayer <[email protected]> Committer: Stefan Sayer <[email protected]> Date: Mon Jan 10 18:58:56 2011 +0100 removed cAmElCase in AmUtils --- core/AmConfig.cpp | 4 ++-- core/AmPlugIn.cpp | 2 +- core/AmUtils.cpp | 10 +++++----- core/AmUtils.h | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/AmConfig.cpp b/core/AmConfig.cpp index 8a05fd5..2df2b54 100644 --- a/core/AmConfig.cpp +++ b/core/AmConfig.cpp @@ -360,8 +360,8 @@ int AmConfig::readConfiguration() AppSelect = App_MAPPING; string appcfg_fname = ModConfigPath + "app_mapping.conf"; DBG("Loading application mapping...\n"); - if (!readRegexMapping(appcfg_fname, "=>", "application mapping", - AppMapping)) { + if (!read_regex_mapping(appcfg_fname, "=>", "application mapping", + AppMapping)) { ERROR("reading application mapping\n"); ret = -1; } diff --git a/core/AmPlugIn.cpp b/core/AmPlugIn.cpp index d99bbc9..49b5e6a 100644 --- a/core/AmPlugIn.cpp +++ b/core/AmPlugIn.cpp @@ -782,7 +782,7 @@ AmSessionFactory* AmPlugIn::findSessionFactory(AmSipRequest& req) break; case AmConfig::App_MAPPING: req.cmd = ""; // no match if not found - runRegexMapping(AmConfig::AppMapping, req.r_uri.c_str(), req.cmd); + run_regex_mapping(AmConfig::AppMapping, req.r_uri.c_str(), req.cmd); break; case AmConfig::App_SPECIFIED: req.cmd = AmConfig::Application; diff --git a/core/AmUtils.cpp b/core/AmUtils.cpp index 0240899..02b45d8 100644 --- a/core/AmUtils.cpp +++ b/core/AmUtils.cpp @@ -1217,9 +1217,9 @@ void add_env_path(const char* name, const string& path) #endif } -bool readRegexMapping(const string& fname, const char* separator, - const char* dbg_type, - RegexMappingVector& result) { +bool read_regex_mapping(const string& fname, const char* separator, + const char* dbg_type, + RegexMappingVector& result) { std::ifstream appcfg(fname.c_str()); if (!appcfg.good()) { ERROR("could not load %s file at '%s'\n", @@ -1255,8 +1255,8 @@ bool readRegexMapping(const string& fname, const char* separator, return true; } -bool runRegexMapping(const RegexMappingVector& mapping, const char* test_s, - string& result) { +bool run_regex_mapping(const RegexMappingVector& mapping, const char* test_s, + string& result) { for (RegexMappingVector::const_iterator it = mapping.begin(); it != mapping.end(); it++) { if (!regexec(&it->first, test_s, 0, NULL, 0)) { diff --git a/core/AmUtils.h b/core/AmUtils.h index eeceee6..d17a044 100644 --- a/core/AmUtils.h +++ b/core/AmUtils.h @@ -348,15 +348,15 @@ typedef std::vector<std::pair<regex_t, string> > RegexMappingVector; /** read a regex=>string mapping from file @return true on success */ -bool readRegexMapping(const string& fname, const char* separator, - const char* dbg_type, - RegexMappingVector& result); +bool read_regex_mapping(const string& fname, const char* separator, + const char* dbg_type, + RegexMappingVector& result); /** run a regex mapping - result is the first matching entry @return true if matched */ -bool runRegexMapping(const RegexMappingVector& mapping, const char* test_s, - string& result); +bool run_regex_mapping(const RegexMappingVector& mapping, const char* test_s, + string& result); #endif // Local Variables: _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
