[asterisk-commits] mmichelson: branch mmichelson/acl-v6 r276532 - in /team/mmichelson/acl-v6: ma...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Jul 14 16:55:14 2010
New Revision: 276532

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=276532
Log:
Fix some whitespace errors and add missing retval tags to doxygen.


Modified:
    team/mmichelson/acl-v6/main/acl.c
    team/mmichelson/acl-v6/tests/test_acl.c

Modified: team/mmichelson/acl-v6/main/acl.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/acl-v6/main/acl.c?view=diff&rev=276532&r1=276531&r2=276532
==============================================================================
--- team/mmichelson/acl-v6/main/acl.c (original)
+++ team/mmichelson/acl-v6/main/acl.c Wed Jul 14 16:55:14 2010
@@ -316,7 +316,7 @@
  * \param input The IPv4 netmask to convert
  * \param output The resulting IPv6 netmask
  * \retval void
- */ 
+ */
 static void map_mask(struct ast_sockaddr *input, struct ast_sockaddr *output)
 {
 	struct sockaddr_in6 sin6;
@@ -384,6 +384,8 @@
  * \param[out] addr The ast_sockaddr produced from the CIDR netmask
  * \param is_v4 Tells if the address we are masking is IPv4.
  * \param mask_str The CIDR mask to convert
+ * \retval -1 Failure
+ * \retval 0 Success
  */
 static int parse_cidr_mask(struct ast_sockaddr *addr, int is_v4, const char *mask_str)
 {

Modified: team/mmichelson/acl-v6/tests/test_acl.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/acl-v6/tests/test_acl.c?view=diff&rev=276532&r1=276531&r2=276532
==============================================================================
--- team/mmichelson/acl-v6/tests/test_acl.c (original)
+++ team/mmichelson/acl-v6/tests/test_acl.c Wed Jul 14 16:55:14 2010
@@ -198,7 +198,7 @@
 		res = AST_TEST_FAIL;
 		goto acl_cleanup;
 	}
-	
+
 	if (!(permit_hav6 = ast_append_ha(permitallv6.access, permitallv6.host, permit_hav6, &err))) {
 		ast_test_status_update(test, "Failed to create permit_all ACL\n");
 		res = AST_TEST_FAIL;
@@ -282,7 +282,7 @@
 			res = AST_TEST_FAIL;
 			goto acl_cleanup;
 		}
-		
+
 		if (permit_resv6 != AST_SENSE_ALLOW) {
 			ast_test_status_update(test, "Access denied to %s on permit_all ACL\n",
 					acl_tests[i].test_address);