Module: sems Branch: master Commit: 4ab3f7cca92d1e2d35a6849ffffd3f4f9923ed21 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=4ab3f7cca92d1e2d35a6849ffffd3f4f9923ed21
Author: Stefan Sayer <[email protected]> Committer: Stefan Sayer <[email protected]> Date: Wed Feb 2 14:24:58 2011 +0100 fix compilation (used 'separator') --- core/AmUtils.cpp | 6 +++--- core/AmUtils.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/AmUtils.cpp b/core/AmUtils.cpp index d8113a3..8a77377 100644 --- a/core/AmUtils.cpp +++ b/core/AmUtils.cpp @@ -1237,7 +1237,7 @@ size_t skip_to_end_of_brackets(const string& s, size_t start) { return res; } -bool read_regex_mapping(const string& fname, const char* separator, +bool read_regex_mapping(const string& fname, const char* sep, const char* dbg_type, RegexMappingVector& result) { std::ifstream appcfg(fname.c_str()); @@ -1255,10 +1255,10 @@ bool read_regex_mapping(const string& fname, const char* separator, if (non_wsp_pos != string::npos && entry[non_wsp_pos] == '#') continue; - vector<string> re_v = explode(entry, separator); + vector<string> re_v = explode(entry, sep); if (re_v.size() != 2) { ERROR("Incorrect line '%s' in %s: expected format 'regexp%sstring'\n", - entry.c_str(), fname.c_str(), separator); + entry.c_str(), fname.c_str(), sep); return false; } regex_t app_re; diff --git a/core/AmUtils.h b/core/AmUtils.h index 6406a15..8d90db9 100644 --- a/core/AmUtils.h +++ b/core/AmUtils.h @@ -351,7 +351,7 @@ typedef std::vector<std::pair<regex_t, string> > RegexMappingVector; /** read a regex=>string mapping from file @return true on success */ -bool read_regex_mapping(const string& fname, const char* separator, +bool read_regex_mapping(const string& fname, const char* sep, const char* dbg_type, RegexMappingVector& result); _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
