summaryrefslogtreecommitdiff
path: root/pcre/pcrecpp.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-11-18 18:07:55 +0100
committerSergei Golubchik <sergii@pisem.net>2014-11-18 18:07:55 +0100
commit553b437d3835764f260df43c74b2e50dacda9c54 (patch)
tree958037ad2350bd096ea4fd022086db502e6cd8f5 /pcre/pcrecpp.cc
parent8cc5973f1a18654e2e09076adeece2897a768411 (diff)
downloadmariadb-git-553b437d3835764f260df43c74b2e50dacda9c54.tar.gz
8.36
Diffstat (limited to 'pcre/pcrecpp.cc')
-rw-r--r--pcre/pcrecpp.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/pcre/pcrecpp.cc b/pcre/pcrecpp.cc
index c0ba9ca14e1..c595cbcab5c 100644
--- a/pcre/pcrecpp.cc
+++ b/pcre/pcrecpp.cc
@@ -511,7 +511,7 @@ int RE::TryMatch(const StringPiece& text,
return 0;
}
- pcre_extra extra = { 0, 0, 0, 0, 0, 0 };
+ pcre_extra extra = { 0, 0, 0, 0, 0, 0, 0, 0 };
if (options_.match_limit() > 0) {
extra.flags |= PCRE_EXTRA_MATCH_LIMIT;
extra.match_limit = options_.match_limit();
@@ -660,6 +660,8 @@ int RE::NumberOfCapturingGroups() const {
/***** Parsers for various types *****/
bool Arg::parse_null(const char* str, int n, void* dest) {
+ (void)str;
+ (void)n;
// We fail if somebody asked us to store into a non-NULL void* pointer
return (dest == NULL);
}