From 38d7209c25f55e0ff339432cf0a35d8056a62d18 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Tue, 16 Dec 2008 19:55:04 +0000 Subject: [PATCH] Thu Dec 11 11:32:13 CST 2008 Pekka Pessi * su_taglist.c. removed globals which should have been static in first place - t_null_next(), t_null_move(), t_null_dup(), t_null_copy(), t_null_find() - t_skip_next(), t_skip_move(), t_skip_len(), t_skip_dup(), t_skip_filter() - t_next_next(), t_next_move(), t_next_len(), t_next_dup(), t_next_filter() git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10815 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/sofia-sip/.update | 2 +- .../sofia-sip/libsofia-sip-ua/su/su_taglist.c | 22 ++++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index 484e0c547d..01c4a67385 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Tue Dec 16 13:52:51 CST 2008 +Tue Dec 16 13:54:44 CST 2008 diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c b/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c index 0fc08c0357..5b699425c0 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c +++ b/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c @@ -828,29 +828,27 @@ int t_scan(tag_type_t tt, su_home_t *home, char const *s, /* ====================================================================== */ /* null tag */ +static tagi_t const *t_null_next(tagi_t const *t) { return NULL; } +static tagi_t *t_null_move(tagi_t *dst, tagi_t const *src) { memset(dst, 0, sizeof(*dst)); return dst + 1; } +static tagi_t *t_null_dup(tagi_t *dst, tagi_t const *src, void **bb) { memset(dst, 0, sizeof(*dst)); return dst + 1; } -tagi_t *t_null_copy(tagi_t *dst, tagi_t const *src, void **bb) -{ - memset(dst, 0, sizeof(*dst)); - return dst + 1; -} - +static tagi_t const * t_null_find(tag_type_t tt, tagi_t const lst[]) { return NULL; @@ -919,26 +917,31 @@ tag_class_t end_tag_class[1] = /* ====================================================================== */ /* skip tag - placeholder in tag list */ +static tagi_t const *t_skip_next(tagi_t const *t) { return t + 1; } +static tagi_t *t_skip_move(tagi_t *dst, tagi_t const *src) { return dst; } +static size_t t_skip_len(tagi_t const *t) { return 0; } +static tagi_t *t_skip_dup(tagi_t *dst, tagi_t const *src, void **bb) { return dst; } +static tagi_t *t_skip_filter(tagi_t *dst, tagi_t const filter[], tagi_t const *src, @@ -968,11 +971,13 @@ tag_typedef_t tag_skip = TAG_TYPEDEF(tag_skip, skip); /* ====================================================================== */ /* next tag - jump to next tag list */ +static tagi_t const *t_next_next(tagi_t const *t) { return (tagi_t *)(t->t_value); } +static tagi_t *t_next_move(tagi_t *dst, tagi_t const *src) { if (!src->t_value) @@ -980,6 +985,7 @@ tagi_t *t_next_move(tagi_t *dst, tagi_t const *src) return dst; } +static size_t t_next_len(tagi_t const *t) { if (!t->t_value) @@ -987,6 +993,7 @@ size_t t_next_len(tagi_t const *t) return 0; } +static tagi_t *t_next_dup(tagi_t *dst, tagi_t const *src, void **bb) { if (!src->t_value) @@ -994,6 +1001,7 @@ tagi_t *t_next_dup(tagi_t *dst, tagi_t const *src, void **bb) return dst; } +static tagi_t *t_next_filter(tagi_t *dst, tagi_t const filter[], tagi_t const *src, @@ -1023,6 +1031,7 @@ tag_typedef_t tag_next = TAG_TYPEDEF(tag_next, next); /* ====================================================================== */ /* filter tag - use function to filter tag */ +static tagi_t *t_filter_with(tagi_t *dst, tagi_t const *t, tagi_t const *src, @@ -1070,6 +1079,7 @@ tag_typedef_t tag_filter = TAG_TYPEDEF(tag_filter, filter); /* ====================================================================== */ /* any tag - match to any tag when filtering */ +static tagi_t *t_any_filter(tagi_t *dst, tagi_t const filter[], tagi_t const *src,