Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
cf45db71
Commit
cf45db71
authored
Jul 20, 2012
by
Alexandre Savard
Browse files
#13726: Fix jenkins error for sdes test
parent
59eb2560
Changes
1
Hide whitespace changes
Inline
Side-by-side
daemon/src/sip/pattern.cpp
View file @
cf45db71
...
...
@@ -36,7 +36,7 @@ namespace sfl {
Pattern
::
Pattern
(
const
std
::
string
&
pattern
,
const
std
::
string
&
options
)
:
pattern_
(
pattern
),
subject_
(),
//
re_(NULL),
re_
(
NULL
),
ovector_
(),
count_
(
0
),
options_
(
0
),
...
...
@@ -81,7 +81,7 @@ void Pattern::compile()
int
offset
;
const
char
*
error
;
//
re_ = pcre_compile(pattern_.c_str(), 0, &error, &offset, NULL);
re_
=
pcre_compile
(
pattern_
.
c_str
(),
0
,
&
error
,
&
offset
,
NULL
);
if
(
re_
==
NULL
)
{
std
::
string
offsetStr
;
...
...
@@ -106,7 +106,7 @@ void Pattern::compile()
unsigned
int
Pattern
::
getCaptureGroupCount
()
{
int
captureCount
=
0
;
//
pcre_fullinfo(re_, NULL, PCRE_INFO_CAPTURECOUNT, &captureCount);
pcre_fullinfo
(
re_
,
NULL
,
PCRE_INFO_CAPTURECOUNT
,
&
captureCount
);
return
captureCount
;
}
...
...
@@ -114,7 +114,7 @@ std::vector<std::string> Pattern::groups()
{
const
char
**
stringList
;
//
pcre_get_substring_list(subject_.c_str(), &ovector_[0], count_, &stringList);
pcre_get_substring_list
(
subject_
.
c_str
(),
&
ovector_
[
0
],
count_
,
&
stringList
);
std
::
vector
<
std
::
string
>
matchedSubstrings
;
for
(
int
i
=
1
;
stringList
[
i
]
!=
NULL
;
i
++
)
matchedSubstrings
.
push_back
(
stringList
[
i
]);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment