update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6951 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
cda9d9fd57
commit
601f7b6e4a
|
@ -552,8 +552,10 @@ SWITCH_DECLARE(switch_status_t) switch_event_del_header(switch_event_t *event, c
|
||||||
{
|
{
|
||||||
switch_event_header_t *hp, *lp = NULL;
|
switch_event_header_t *hp, *lp = NULL;
|
||||||
switch_status_t status = SWITCH_STATUS_FALSE;
|
switch_status_t status = SWITCH_STATUS_FALSE;
|
||||||
|
int x = 0;
|
||||||
for (hp = event->headers; hp; hp = hp->next) {
|
for (hp = event->headers; hp; hp = hp->next) {
|
||||||
|
x++;
|
||||||
|
switch_assert(x < 1000);
|
||||||
if (!strcmp(header_name, hp->name)) {
|
if (!strcmp(header_name, hp->name)) {
|
||||||
if (lp) {
|
if (lp) {
|
||||||
lp->next = hp->next;
|
lp->next = hp->next;
|
||||||
|
@ -562,6 +564,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_del_header(switch_event_t *event, c
|
||||||
}
|
}
|
||||||
FREE(hp->name);
|
FREE(hp->name);
|
||||||
FREE(hp->value);
|
FREE(hp->value);
|
||||||
|
memset(hp, 0, sizeof(*hp));
|
||||||
if (switch_queue_trypush(EVENT_HEADER_RECYCLE_QUEUE, hp) != SWITCH_STATUS_SUCCESS) {
|
if (switch_queue_trypush(EVENT_HEADER_RECYCLE_QUEUE, hp) != SWITCH_STATUS_SUCCESS) {
|
||||||
FREE(hp);
|
FREE(hp);
|
||||||
}
|
}
|
||||||
|
@ -611,6 +614,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_add_header(switch_event_t *event, s
|
||||||
hp->next = header;
|
hp->next = header;
|
||||||
} else {
|
} else {
|
||||||
event->headers = header;
|
event->headers = header;
|
||||||
|
header->next = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
|
@ -652,11 +656,13 @@ SWITCH_DECLARE(void) switch_event_destroy(switch_event_t **event)
|
||||||
hp = hp->next;
|
hp = hp->next;
|
||||||
FREE(this->name);
|
FREE(this->name);
|
||||||
FREE(this->value);
|
FREE(this->value);
|
||||||
|
memset(this, 0, sizeof(*this));
|
||||||
if (switch_queue_trypush(EVENT_HEADER_RECYCLE_QUEUE, this) != SWITCH_STATUS_SUCCESS) {
|
if (switch_queue_trypush(EVENT_HEADER_RECYCLE_QUEUE, this) != SWITCH_STATUS_SUCCESS) {
|
||||||
FREE(this);
|
FREE(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FREE(ep->body);
|
FREE(ep->body);
|
||||||
|
memset(ep, 0, sizeof(*ep));
|
||||||
if (switch_queue_trypush(EVENT_RECYCLE_QUEUE, ep) != SWITCH_STATUS_SUCCESS) {
|
if (switch_queue_trypush(EVENT_RECYCLE_QUEUE, ep) != SWITCH_STATUS_SUCCESS) {
|
||||||
FREE(ep);
|
FREE(ep);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue