[asterisk-commits] seanbright: branch group/asterisk-cpp r168194 - in /team/group/asterisk-cpp: ...

[SVN commits to the Asterisk project]

Author: seanbright
Date: Fri Jan  9 15:55:45 2009
New Revision: 168194

URL: http://svn.digium.com/view/asterisk?view=rev&rev=168194
Log:
And Sean saw acl.c, and it was good.

Modified:
    team/group/asterisk-cpp/include/asterisk/utils.h
    team/group/asterisk-cpp/main/acl.c

Modified: team/group/asterisk-cpp/include/asterisk/utils.h
URL: http://svn.digium.com/view/asterisk/team/group/asterisk-cpp/include/asterisk/utils.h?view=diff&rev=168194&r1=168193&r2=168194
==============================================================================
--- team/group/asterisk-cpp/include/asterisk/utils.h (original)
+++ team/group/asterisk-cpp/include/asterisk/utils.h Fri Jan  9 15:55:45 2009
@@ -626,7 +626,7 @@
 	({                                                                \
 		const char *__old = (s);                                  \
 		size_t __len = strlen(__old) + 1;                         \
-		char *__new = __builtin_alloca(__len);                    \
+		char *__new = (char *) __builtin_alloca(__len);            \
 		memcpy (__new, __old, __len);                             \
 		__new;                                                    \
 	}))

Modified: team/group/asterisk-cpp/main/acl.c
URL: http://svn.digium.com/view/asterisk/team/group/asterisk-cpp/main/acl.c?view=diff&rev=168194&r1=168193&r2=168194
==============================================================================
--- team/group/asterisk-cpp/main/acl.c (original)
+++ team/group/asterisk-cpp/main/acl.c Fri Jan  9 15:55:45 2009
@@ -232,7 +232,7 @@
 {
 	struct ast_ha *new_ha;
 
-	if ((new_ha = ast_malloc(sizeof(*new_ha)))) {
+	if ((new_ha = (struct ast_ha *) ast_malloc(sizeof(*new_ha)))) {
 		/* Copy from original to new object */
 		ast_copy_ha(original, new_ha);
 	}
@@ -277,7 +277,7 @@
 		path = path->next;
 	}
 
-	ha = ast_malloc(sizeof(*ha));
+	ha = (struct ast_ha *) ast_malloc(sizeof(*ha));
 	if (!ha)
 		return ret;
 
@@ -328,7 +328,10 @@
 		ret = ha;
 	}
 
-	ast_debug(1, "%s/%s sense %d appended to acl for peer\n", ast_strdupa(ast_inet_ntoa(ha->netaddr)), ast_strdupa(ast_inet_ntoa(ha->netmask)), ha->sense);
+	ast_debug(1, "%s/%s sense %d appended to acl for peer\n",
+              ast_strdupa(ast_inet_ntoa(ha->netaddr)),
+              ast_strdupa(ast_inet_ntoa(ha->netmask)),
+              ha->sense);
 
 	return ret;
 }
@@ -380,7 +383,7 @@
 }
 
 struct dscp_codepoint {
-	char *name;
+	const char *name;
 	unsigned int space;
 };