More merges from resolve-shadow warnings:

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136408 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-08-07 15:16:48 +00:00
parent 8397209316
commit 6305009cfc
8 changed files with 107 additions and 108 deletions

View File

@@ -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);
}