[asterisk-commits] simon.perreault: branch group/v6-new r273976 - in /team/group/v6-new: channel...

[SVN commits to the Asterisk project]

Author: simon.perreault
Date: Mon Jul  5 09:49:25 2010
New Revision: 273976

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=273976
Log:
Coding guideline fixes

Modified:
    team/group/v6-new/channels/chan_sip.c
    team/group/v6-new/main/dnsmgr.c

Modified: team/group/v6-new/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/v6-new/channels/chan_sip.c?view=diff&rev=273976&r1=273975&r2=273976
==============================================================================
--- team/group/v6-new/channels/chan_sip.c (original)
+++ team/group/v6-new/channels/chan_sip.c Mon Jul  5 09:49:25 2010
@@ -7619,11 +7619,11 @@
 		}
 	}
 
-	if(!strcmp("IP4", proto))
+	if (!strcmp("IP4", proto)) {
 		af = AF_INET;
-	else if(!strcmp("IP6", proto))
+	} else if (!strcmp("IP6", proto)) {
 		af = AF_INET6;
-	else {
+	} else {
 		ast_log(LOG_WARNING, "Unknown protocol '%s'.\n", proto);
 		return -1;
 	}
@@ -12495,8 +12495,9 @@
 	}
 
 	/* handle the transport type specified in Contact header. */
-	if (!(transport_type = get_transport_str2enum(transport)))
+	if (!(transport_type = get_transport_str2enum(transport))) {
 		transport_type = pvt->socket.type;
+	}
 
 	/* if the peer's socket type is different than the Registration
 	 * transport type, change it.  If it got this far, it is a
@@ -13318,7 +13319,8 @@
 					      "Peer: SIP/%s\r\n"
 					      "PeerStatus: Rejected\r\n"
 					      "Cause: AUTH_SECRET_FAILED\r\n"
-					      "Address: %s\r\nPort: %s\r\n",
+					      "Address: %s\r\n"
+					      "Port: %s\r\n",
 					      name, ast_sockaddr_stringify_addr(addr),
 					      ast_sockaddr_stringify_port(addr));
 			}

Modified: team/group/v6-new/main/dnsmgr.c
URL: http://svnview.digium.com/svn/asterisk/team/group/v6-new/main/dnsmgr.c?view=diff&rev=273976&r1=273975&r2=273976
==============================================================================
--- team/group/v6-new/main/dnsmgr.c (original)
+++ team/group/v6-new/main/dnsmgr.c Mon Jul  5 09:49:25 2010
@@ -159,7 +159,7 @@
 	if (!ast_get_ip_or_srv(&tmp, entry->name, entry->service)) {
 		if (!ast_sockaddr_port(&tmp))
 			ast_sockaddr_set_port(&tmp, ast_sockaddr_port(entry->result));
-		if(ast_sockaddr_cmp(&tmp, entry->result)) {
+		if (ast_sockaddr_cmp(&tmp, entry->result)) {
 			ast_log(LOG_NOTICE, "dnssrv: host '%s' changed from %s to %s\n",
 					entry->name, ast_sockaddr_stringify(entry->result),
 					ast_sockaddr_stringify(&tmp));