adamdebreceni commented on code in PR #1331:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1331#discussion_r874570169
##########
libminifi/include/utils/RegexUtils.h:
##########
@@ -149,25 +149,25 @@ class Regex {
int regex_mode_;
#endif
- friend bool regexMatch(const std::string &pattern, const Regex& regex);
- friend bool regexMatch(const std::string &pattern, SMatch& match, const
Regex& regex);
- friend bool regexSearch(const std::string &pattern, const Regex& regex);
- friend bool regexSearch(const std::string &pattern, SMatch& match, const
Regex& regex);
- friend SMatch getLastRegexMatch(const std::string& pattern, const
utils::Regex& regex);
+ friend bool regexMatch(const std::string &string, const Regex& regex);
+ friend bool regexMatch(const std::string &string, SMatch& match, const
Regex& regex);
+ friend bool regexSearch(const std::string &string, const Regex& regex);
+ friend bool regexSearch(const std::string &string, SMatch& match, const
Regex& regex);
+ friend SMatch getLastRegexMatch(const std::string& string, const
utils::Regex& regex);
};
-bool regexMatch(const std::string &pattern, const Regex& regex);
-bool regexMatch(const std::string &pattern, SMatch& match, const Regex& regex);
+bool regexMatch(const std::string &string, const Regex& regex);
+bool regexMatch(const std::string &string, SMatch& match, const Regex& regex);
-bool regexSearch(const std::string &pattern, const Regex& regex);
-bool regexSearch(const std::string &pattern, SMatch& match, const Regex&
regex);
+bool regexSearch(const std::string &string, const Regex& regex);
+bool regexSearch(const std::string &string, SMatch& match, const Regex& regex);
/**
* Returns the last match of a regular expression within the given string
- * @param pattern incoming string
+ * @param string incoming string
* @param regex the regex to be matched
* @return the last valid SMatch or a default constructed SMatch (ready() !=
true) if no matches have been found
*/
-SMatch getLastRegexMatch(const std::string& pattern, const utils::Regex&
regex);
+SMatch getLastRegexMatch(const std::string& string, const utils::Regex& regex);
Review Comment:
nitpick: [here](https://en.cppreference.com/w/cpp/regex/regex_match)
`std::regex_match` uses the parameter name `str` and references it as `target`,
ultimately I'm fine with either `string`, `str`, `target`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
