[Asterisk-cvs] asterisk/channels chan_sip.c,1.438,1.439

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv3589/channels

Modified Files:
	chan_sip.c 
Log Message:
Cleanup SIP formatting, strncpy's strncats and global variable names (bug #1990)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -d -r1.438 -r1.439
--- chan_sip.c	8 Jul 2004 07:21:52 -0000	1.438
+++ chan_sip.c	8 Jul 2004 11:05:03 -0000	1.439
@@ -132,15 +132,15 @@
 
 #define ALLOWED_METHODS "INVITE, ACK, CANCEL, OPTIONS, BYE, REFER"
 
-static char useragent[AST_MAX_EXTENSION] = DEFAULT_USERAGENT;
+static char default_useragent[AST_MAX_EXTENSION] = DEFAULT_USERAGENT;
 
-static char context[AST_MAX_EXTENSION] = "default";
+static char default_context[AST_MAX_EXTENSION] = "default";
 
-static char language[MAX_LANGUAGE] = "";
+static char default_language[MAX_LANGUAGE] = "";
[...1122 lines suppressed...]
 			max_expiry = atoi(v->value);
 			if (max_expiry < 1)
@@ -8166,7 +8191,7 @@
 			if (format < 1) 
 				ast_log(LOG_WARNING, "Cannot allow unknown format '%s'\n", v->value);
 			else {
-				capability |= format;
+				global_capability |= format;
 				sip_pref_append(format);
 			}
 		} else if (!strcasecmp(v->name, "disallow")) {
@@ -8174,7 +8199,7 @@
 			if (format < 1) 
 				ast_log(LOG_WARNING, "Cannot disallow unknown format '%s'\n", v->value);
 			else {
-				capability &= ~format;
+				global_capability &= ~format;
 				sip_pref_remove(format);
 			}
 		} else if (!strcasecmp(v->name, "register")) {