[asterisk-commits] oej: trunk r277102 - in /trunk/main: dnsmgr.c srv.c

[SVN commits to the Asterisk project]

Author: oej
Date: Fri Jul 16 08:32:22 2010
New Revision: 277102

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=277102
Log:
Formatting changes

Modified:
    trunk/main/dnsmgr.c
    trunk/main/srv.c

Modified: trunk/main/dnsmgr.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/dnsmgr.c?view=diff&rev=277102&r1=277101&r2=277102
==============================================================================
--- trunk/main/dnsmgr.c (original)
+++ trunk/main/dnsmgr.c Fri Jul 16 08:32:22 2010
@@ -88,8 +88,9 @@
 	struct ast_dnsmgr_entry *entry;
 	int total_size = sizeof(*entry) + strlen(name) + (service ? strlen(service) + 1 : 0);
 
-	if (!result || ast_strlen_zero(name) || !(entry = ast_calloc(1, total_size)))
+	if (!result || ast_strlen_zero(name) || !(entry = ast_calloc(1, total_size))) {
 		return NULL;
+	}
 
 	entry->result = result;
 	ast_mutex_init(&entry->lock);
@@ -122,11 +123,13 @@
 
 int ast_dnsmgr_lookup(const char *name, struct ast_sockaddr *result, struct ast_dnsmgr_entry **dnsmgr, const char *service)
 {
-	if (ast_strlen_zero(name) || !result || !dnsmgr)
+	if (ast_strlen_zero(name) || !result || !dnsmgr) {
 		return -1;
-
-	if (*dnsmgr && !strcasecmp((*dnsmgr)->name, name))
+	}
+
+	if (*dnsmgr && !strcasecmp((*dnsmgr)->name, name)) {
 		return 0;
+	}
 
 	ast_verb(4, "doing dnsmgr_lookup for '%s'\n", name);
 
@@ -134,8 +137,9 @@
 	ast_get_ip_or_srv(result, name, service);
 	
 	/* if dnsmgr is not enable don't bother adding an entry */
-	if (!enabled)
+	if (!enabled) {
 		return 0;
+	}
 	
 	ast_verb(3, "adding dns manager for '%s'\n", name);
 	*dnsmgr = ast_dnsmgr_get(name, result, service);

Modified: trunk/main/srv.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/srv.c?view=diff&rev=277102&r1=277101&r2=277102
==============================================================================
--- trunk/main/srv.c (original)
+++ trunk/main/srv.c Fri Jul 16 08:32:22 2010
@@ -248,6 +248,7 @@
 {
 	const char *host;
 	unsigned short port;
+
 	while (!(ast_srv_lookup(context, NULL, &host, &port)));
 }
 
@@ -257,16 +258,19 @@
 	struct srv_entry *current;
 	int ret;
 
-	if (chan && ast_autoservice_start(chan) < 0)
-		return -1;
+	if (chan && ast_autoservice_start(chan) < 0) {
+		return -1;
+	}
 
 	ret = ast_search_dns(&context, service, C_IN, T_SRV, srv_callback);
 
-	if (context.have_weights)
+	if (context.have_weights) {
 		process_weights(&context);
-
-	if (chan)
+	}
+
+	if (chan) {
 		ret |= ast_autoservice_stop(chan);
+	}
 
 	/* TODO: there could be a "." entry in the returned list of
 	   answers... if so, this requires special handling */
@@ -285,8 +289,9 @@
 		*port = -1;
 	}
 
-	while ((current = AST_LIST_REMOVE_HEAD(&context.entries, list)))
+	while ((current = AST_LIST_REMOVE_HEAD(&context.entries, list))) {
 		ast_free(current);
+	}
 
 	return ret;
 }