mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-16 22:38:38 +00:00
update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4968 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
1 parent
376d177b3c
commit
fbf2a1cb79
7 files changed
+72
-46
No files matched your search
@@ -96,7 +96,7 @@ iks_filter_remove_rule (iksfilter *f, iksrule *rule)
|
||||
if (rule->next) rule->next->prev = rule->prev;
|
||||
if (f->rules == rule) f->rules = rule->next;
|
||||
if (f->last_rule == rule) f->last_rule = rule->prev;
|
||||
iks_stack_delete (rule->s);
|
||||
iks_stack_delete (&rule->s);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -174,7 +174,7 @@ iks_filter_delete (iksfilter *f)
|
||||
rule = f->rules;
|
||||
while (rule) {
|
||||
tmp = rule->next;
|
||||
iks_stack_delete (rule->s);
|
||||
iks_stack_delete (&rule->s);
|
||||
rule = tmp;
|
||||
}
|
||||
iks_free (f);
|
||||
|
||||
@@ -60,7 +60,7 @@ iks_new (const char *name)
|
||||
if (!s) return NULL;
|
||||
x = iks_new_within (name, s);
|
||||
if (!x) {
|
||||
iks_stack_delete (s);
|
||||
iks_stack_delete (&s);
|
||||
return NULL;
|
||||
}
|
||||
return x;
|
||||
@@ -202,7 +202,7 @@ iks_hide (iks *x)
|
||||
void
|
||||
iks_delete (iks *x)
|
||||
{
|
||||
if (x) iks_stack_delete (x->s);
|
||||
if (x) iks_stack_delete (&x->s);
|
||||
}
|
||||
|
||||
/***** Node Traversing *****/
|
||||
|
||||
@@ -182,10 +182,20 @@ iks_stack_stat (ikstack *s, size_t *allocated, size_t *used)
|
||||
}
|
||||
|
||||
void
|
||||
iks_stack_delete (ikstack *s)
|
||||
iks_stack_delete (ikstack **sp)
|
||||
{
|
||||
ikschunk *c, *tmp;
|
||||
ikstack *s;
|
||||
|
||||
if (!sp) {
|
||||
return;
|
||||
}
|
||||
|
||||
s = *sp;
|
||||
|
||||
if (!s) {
|
||||
return;
|
||||
}
|
||||
c = s->meta->next;
|
||||
while (c) {
|
||||
tmp = c->next;
|
||||
@@ -199,4 +209,5 @@ iks_stack_delete (ikstack *s)
|
||||
c = tmp;
|
||||
}
|
||||
iks_free (s);
|
||||
*sp = NULL;
|
||||
}
|
||||
@@ -629,5 +629,5 @@ iks_parser_delete (iksparser *prs)
|
||||
if (prs->deleteHook) prs->deleteHook (prs->user_data);
|
||||
if (prs->stack) iks_free (prs->stack);
|
||||
if (prs->atts) iks_free (prs->atts);
|
||||
if (prs->s) iks_stack_delete (prs->s); else iks_free (prs);
|
||||
if (prs->s) iks_stack_delete (&prs->s); else iks_free (prs);
|
||||
}
|
||||
@@ -22,7 +22,7 @@ iks_malloc (size_t size)
|
||||
}
|
||||
|
||||
void
|
||||
iks_free (void *ptr)
|
||||
iks_real_free (void *ptr)
|
||||
{
|
||||
if (my_free_func)
|
||||
my_free_func (ptr);
|
||||
|
||||
Reference in new issue
Block a user