From c44f2711957c4e687f856eae79a499d96e5c08ef Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Mon, 3 Feb 2020 16:43:43 +0800 Subject: [PATCH] Fix ret undefined error in nsh_telnetlogin when CONFIG_NSH_LOGIN_PLATFORM enable Change-Id: Ib1fa8ba6879a5b330201f1144a2e5827cc4b1d0a Signed-off-by: Xiang Xiao --- nshlib/nsh_telnetlogin.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/nshlib/nsh_telnetlogin.c b/nshlib/nsh_telnetlogin.c index 27132d899..b2db2e334 100644 --- a/nshlib/nsh_telnetlogin.c +++ b/nshlib/nsh_telnetlogin.c @@ -176,9 +176,6 @@ int nsh_telnetlogin(FAR struct console_stdio_s *pstate) { char username[16]; char password[16]; -#ifdef CONFIG_NSH_LOGIN_PASSWD - int ret; -#endif int i; /* Present the NSH Telnet greeting */ @@ -219,13 +216,9 @@ int nsh_telnetlogin(FAR struct console_stdio_s *pstate) /* Verify the username and password */ #if defined(CONFIG_NSH_LOGIN_PASSWD) - ret = passwd_verify(username, password); - if (PASSWORD_VERIFY_MATCH(ret)) - + if (PASSWORD_VERIFY_MATCH(passwd_verify(username, password))) #elif defined(CONFIG_NSH_LOGIN_PLATFORM) - ret = platform_user_verify(username, password); - if (PASSWORD_VERIFY_MATCH(ret)) - + if (PASSWORD_VERIFY_MATCH(platform_user_verify(username, password))) #elif defined(CONFIG_NSH_LOGIN_FIXED) if (strcmp(password, CONFIG_NSH_LOGIN_PASSWORD) == 0 && strcmp(username, CONFIG_NSH_LOGIN_USERNAME) == 0)