More merges from resolve-shadow warnings:

  utils/
  codecs/
  and a change I missed from formats/


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

1 files changed, 2 insertions, 2 deletions

diff --git a/utils/astman.c b/utils/astman.c
index 3cfc27d81..a8b8e597a 100644
--- a/utils/astman.c
+++ b/utils/astman.c
@@ -626,7 +626,7 @@ static int manage_calls(char *host)
 	return 0;
 }
 
-static int login(char *hostname)
+static int manager_login(char *hostname)
 {
 	newtComponent form;
 	newtComponent cancel;
@@ -756,7 +756,7 @@ int main(int argc, char *argv[])
 	newtCls();
 	newtDrawRootText(0, 0, "Asterisk Manager (C)2002, Linux Support Services, Inc.");
 	newtPushHelpLine("Welcome to the Asterisk Manager!");
-	if (login(argv[1])) {
+	if (manager_login(argv[1])) {
 		newtFinished();
 		exit(1);
 	}