[asterisk-commits] russell: branch group/asterisk-cpp r168416 - /team/group/asterisk-cpp/main/

[SVN commits to the Asterisk project]

Author: russell
Date: Sat Jan 10 19:45:43 2009
New Revision: 168416

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=168416
Log:
dnsmgr.c builds

Modified:
    team/group/asterisk-cpp/main/dnsmgr.c

Modified: team/group/asterisk-cpp/main/dnsmgr.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/asterisk-cpp/main/dnsmgr.c?view=diff&rev=168416&r1=168415&r2=168416
==============================================================================
--- team/group/asterisk-cpp/main/dnsmgr.c (original)
+++ team/group/asterisk-cpp/main/dnsmgr.c Sat Jan 10 19:45:43 2009
@@ -80,17 +80,14 @@
 	regex_t filter;
 };
 
-static struct refresh_info master_refresh_info = {
-	.entries = &entry_list,
-	.verbose = 0,
-};
+static struct refresh_info master_refresh_info = { &entry_list, };
 
 struct ast_dnsmgr_entry *ast_dnsmgr_get(const char *name, struct sockaddr_in *result, const char *service)
 {
 	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 = (struct ast_dnsmgr_entry *) ast_calloc(1, total_size)))
 		return NULL;
 
 	entry->result = result;
@@ -272,10 +269,8 @@
 
 static char *handle_cli_refresh(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
-	struct refresh_info info = {
-		.entries = &entry_list,
-		.verbose = 1,
-	};
+	struct refresh_info info = { &entry_list, 1 };
+
 	switch (cmd) {
 	case CLI_INIT:
 		e->command = "dnsmgr refresh";
@@ -343,9 +338,9 @@
 	return CLI_SUCCESS;
 }
 
-static struct ast_cli_entry cli_reload = AST_CLI_DEFINE(handle_cli_reload, "Reloads the DNS manager configuration");
-static struct ast_cli_entry cli_refresh = AST_CLI_DEFINE(handle_cli_refresh, "Performs an immediate refresh");
-static struct ast_cli_entry cli_status = AST_CLI_DEFINE(handle_cli_status, "Display the DNS manager status");
+static struct ast_cli_entry cli_reload(handle_cli_reload, "Reloads the DNS manager configuration");
+static struct ast_cli_entry cli_refresh(handle_cli_refresh, "Performs an immediate refresh");
+static struct ast_cli_entry cli_status(handle_cli_status, "Display the DNS manager status");
 
 int dnsmgr_init(void)
 {