Another big chunk of changes from the RSW branch. Bunch of stuff from main/

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@137082 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 5 insertions, 5 deletions

diff --git a/main/acl.c b/main/acl.c
index 54747de5f..0787274ab 100644
--- a/main/acl.c
+++ b/main/acl.c
@@ -246,18 +246,18 @@ struct ast_ha *ast_duplicate_ha_list(struct ast_ha *original)
 {
 	struct ast_ha *start = original;
 	struct ast_ha *ret = NULL;
-	struct ast_ha *link, *prev = NULL;
+	struct ast_ha *current, *prev = NULL;
 
 	while (start) {
-		link = ast_duplicate_ha(start);  /* Create copy of this object */
+		current = ast_duplicate_ha(start);  /* Create copy of this object */
 		if (prev)
-			prev->next = link;		/* Link previous to this object */
+			prev->next = current;		/* Link previous to this object */
 
 		if (!ret)
-			ret = link;		/* Save starting point */
+			ret = current;		/* Save starting point */
 
 		start = start->next;		/* Go to next object */
-		prev = link;			/* Save pointer to this object */
+		prev = current;			/* Save pointer to this object */
 	}
 	return ret;    			/* Return start of list */
 }