Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
fc109e21
Commit
fc109e21
authored
Jun 27, 2016
by
Sylvain Berfini
🐮
Browse files
Get rid of BelCardParser instance
parent
a445dabd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
6 deletions
+9
-6
coreapi/vcard.cc
coreapi/vcard.cc
+9
-6
No files found.
coreapi/vcard.cc
View file @
fc109e21
...
...
@@ -56,8 +56,8 @@ void linphone_vcard_free(LinphoneVcard *vCard) {
bctbx_list_t
*
linphone_vcard_list_from_vcard4_file
(
const
char
*
filename
)
{
bctbx_list_t
*
result
=
NULL
;
if
(
filename
)
{
belcard
::
BelCardParser
parser
=
belcard
::
BelCardParser
::
getInstance
();
shared_ptr
<
belcard
::
BelCardList
>
belCards
=
parser
.
parseFile
(
filename
);
belcard
::
BelCardParser
*
parser
=
new
belcard
::
BelCardParser
();
shared_ptr
<
belcard
::
BelCardList
>
belCards
=
parser
->
parseFile
(
filename
);
if
(
belCards
)
{
for
(
auto
it
=
belCards
->
getCards
().
begin
();
it
!=
belCards
->
getCards
().
end
();
++
it
)
{
shared_ptr
<
belcard
::
BelCard
>
belCard
=
(
*
it
);
...
...
@@ -65,6 +65,7 @@ bctbx_list_t* linphone_vcard_list_from_vcard4_file(const char *filename) {
result
=
bctbx_list_append
(
result
,
vCard
);
}
}
free
(
parser
);
}
return
result
;
}
...
...
@@ -72,8 +73,8 @@ bctbx_list_t* linphone_vcard_list_from_vcard4_file(const char *filename) {
bctbx_list_t
*
linphone_vcard_list_from_vcard4_buffer
(
const
char
*
buffer
)
{
bctbx_list_t
*
result
=
NULL
;
if
(
buffer
)
{
belcard
::
BelCardParser
parser
=
belcard
::
BelCardParser
::
getInstance
();
shared_ptr
<
belcard
::
BelCardList
>
belCards
=
parser
.
parse
(
buffer
);
belcard
::
BelCardParser
*
parser
=
new
belcard
::
BelCardParser
();
shared_ptr
<
belcard
::
BelCardList
>
belCards
=
parser
->
parse
(
buffer
);
if
(
belCards
)
{
for
(
auto
it
=
belCards
->
getCards
().
begin
();
it
!=
belCards
->
getCards
().
end
();
++
it
)
{
shared_ptr
<
belcard
::
BelCard
>
belCard
=
(
*
it
);
...
...
@@ -81,6 +82,7 @@ bctbx_list_t* linphone_vcard_list_from_vcard4_buffer(const char *buffer) {
result
=
bctbx_list_append
(
result
,
vCard
);
}
}
free
(
parser
);
}
return
result
;
}
...
...
@@ -88,13 +90,14 @@ bctbx_list_t* linphone_vcard_list_from_vcard4_buffer(const char *buffer) {
LinphoneVcard
*
linphone_vcard_new_from_vcard4_buffer
(
const
char
*
buffer
)
{
LinphoneVcard
*
vCard
=
NULL
;
if
(
buffer
)
{
belcard
::
BelCardParser
parser
=
belcard
::
BelCardParser
::
getInstance
();
shared_ptr
<
belcard
::
BelCard
>
belCard
=
parser
.
parseOne
(
buffer
);
belcard
::
BelCardParser
*
parser
=
new
belcard
::
BelCardParser
();
shared_ptr
<
belcard
::
BelCard
>
belCard
=
parser
->
parseOne
(
buffer
);
if
(
belCard
)
{
vCard
=
linphone_vcard_new_from_belcard
(
belCard
);
}
else
{
ms_error
(
"Couldn't parse buffer %s"
,
buffer
);
}
free
(
parser
);
}
return
vCard
;
}
...
...
Write
Preview
Markdown
is supported
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