Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv12870/channels
Modified Files:
chan_sip.c
Log Message:
phase two of string portability stuff:
don't need ast_ prefixes on functions
use individual #defines for function presence
add vasprintf to portability library
Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.779
retrieving revision 1.780
diff -u -d -r1.779 -r1.780
--- chan_sip.c 13 Jul 2005 18:06:49 -0000 1.779
+++ chan_sip.c 15 Jul 2005 22:06:15 -0000 1.780
@@ -2900,7 +2900,7 @@
ast_copy_string(tmp, get_header(req, "To"),
sizeof(tmp));
else
ast_copy_string(tmp, get_header(req, "From"),
sizeof(tmp));
- tag = ast_strcasestr(tmp, "tag=");
+ tag = strcasestr(tmp, "tag=");
if (tag) {
tag += 4;
c = strchr(tag, ';');
@@ -3671,7 +3671,7 @@
copy_all_header(resp, req, "Record-Route");
copy_header(resp, req, "From");
ot = get_header(req, "To");
- if (!ast_strcasestr(ot, "tag=") && strncmp(msg, "100", 3)) {
+ if (!strcasestr(ot, "tag=") && strncmp(msg, "100", 3)) {
/* Add the proper tag if we don't have it already. If they
have specified
their tag, use it. Otherwise, use our own tag */
if (!ast_strlen_zero(p->theirtag) && ast_test_flag(p,
SIP_OUTGOING))
@@ -3770,7 +3770,7 @@
/* Add tag *unless* this is a CANCEL, in which case we need to send it
exactly
as our original request, including tag (or presumably lack thereof)
*/
- if (!ast_strcasestr(ot, "tag=") && sipmethod != SIP_CANCEL) {
+ if (!strcasestr(ot, "tag=") && sipmethod != SIP_CANCEL) {
/* Add the proper tag if we don't have it already. If they
have specified
their tag, use it. Otherwise, use our own tag */
if (ast_test_flag(p, SIP_OUTGOING) &&
!ast_strlen_zero(p->theirtag))
@@ -8428,7 +8428,7 @@
/* Get their tag if we haven't already */
if (ast_strlen_zero(p->theirtag)) {
to = get_header(req, "To");
- to = ast_strcasestr(to, "tag=");
+ to = strcasestr(to, "tag=");
if (to) {
to += 4;
ast_copy_string(p->theirtag, to, sizeof(p->theirtag));
@@ -9540,7 +9540,7 @@
/* Find their tag if we haven't got it */
if (ast_strlen_zero(p->theirtag)) {
from = get_header(req, "From");
- from = ast_strcasestr(from, "tag=");
+ from = strcasestr(from, "tag=");
if (from) {
from += 4;
ast_copy_string(p->theirtag, from, sizeof(p->theirtag));
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
