mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-20 04:28:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor changes

Browse source
This commit is contained in:
Simon Morlat 2013-12-12 17:25:15 +01:00
parent 9149278c8d
commit 70f9617b50
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
coreapi/bellesip_sal/sal_op_presence.c
View file

@ -44,8 +44,6 @@ void sal_add_presence_info(SalOp *op, belle_sip_message_t *notify, SalPresenceMo
belle_sip_message_set_body(BELLE_SIP_MESSAGE(notify),content,content_length);
ms_free(content);
}
}
static void presence_process_io_error(void *user_ctx, const belle_sip_io_error_event_t *event){

9
coreapi/presence.c
View file

@ -1896,7 +1896,7 @@ void linphone_notify_convert_presence_to_xml(SalOp *op, SalPresenceModel *presen
if ((model == NULL) || (model->services == NULL)) {
err = write_xml_presence_service(writer, NULL, contact);
} else {
struct _presence_service_obj_st st;
struct _presence_service_obj_st st={0};
st.writer = writer;
st.contact = contact;
st.err = &err;
@ -1904,13 +1904,13 @@ void linphone_notify_convert_presence_to_xml(SalOp *op, SalPresenceModel *presen
}
}
if ((err >= 0) && (model != NULL)) {
struct _presence_person_obj_st st;
struct _presence_person_obj_st st={0};
st.writer = writer;
st.err = &err;
ms_list_for_each2(model->persons, (MSIterate2Func)write_xml_presence_person_obj, &st);
}
if ((err >= 0) && (model != NULL)) {
struct _presence_note_obj_st st;
struct _presence_note_obj_st st={0};
st.writer = writer;
st.ns = NULL;
st.err = &err;
@ -1923,12 +1923,11 @@ void linphone_notify_convert_presence_to_xml(SalOp *op, SalPresenceModel *presen
if (err >= 0) {
err = xmlTextWriterEndDocument(writer);
}
xmlFreeTextWriter(writer);
if (err > 0) {
/* xmlTextWriterEndDocument returns the size of the content. */
*content = ms_strdup((char *)buf->content);
}
xmlFreeTextWriter(writer);
xmlBufferFree(buf);
}