From 396b3b51b4b6ba26c9ef9dc71bc85bbcd298de67 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Wed, 28 Aug 2024 10:07:36 +0200 Subject: [PATCH] [utils,passphrase] format & clean code --- libfreerdp/utils/passphrase.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/libfreerdp/utils/passphrase.c b/libfreerdp/utils/passphrase.c index a9780c3c3..78b836d81 100644 --- a/libfreerdp/utils/passphrase.c +++ b/libfreerdp/utils/passphrase.c @@ -128,7 +128,7 @@ static void replace_char(char* buffer, size_t buffer_len, const char* toreplace) } char* freerdp_passphrase_read_tty(rdpContext* context, const char* prompt, char* buf, size_t bufsiz, - int from_stdin) + int from_stdin) { BOOL terminal_needs_reset = FALSE; char term_name[L_ctermid] = { 0 }; @@ -213,24 +213,21 @@ error: } } - char* freerdp_passphrase_read_askpass(const char* prompt, char* buf, size_t bufsiz, - char const *askpass_env) + char const* askpass_env) { char command[4096] = { 0 }; - FILE *askproc; - int status; - sprintf_s(command, sizeof(command), "%s 'FreeRDP authentication\n%s'", - askpass_env, prompt); - askproc = popen(command, "r"); + (void)sprintf_s(command, sizeof(command), "%s 'FreeRDP authentication\n%s'", askpass_env, + prompt); + FILE* askproc = popen(command, "r"); if (!askproc) return NULL; if (fgets(buf, bufsiz, askproc) != NULL) buf[strcspn(buf, "\r\n")] = '\0'; else buf = NULL; - status = pclose(askproc); + const int status = pclose(askproc); if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) buf = NULL; @@ -240,7 +237,7 @@ char* freerdp_passphrase_read_askpass(const char* prompt, char* buf, size_t bufs char* freerdp_passphrase_read(rdpContext* context, const char* prompt, char* buf, size_t bufsiz, int from_stdin) { - char const *askpass_env = getenv("FREERDP_ASKPASS"); + char const* askpass_env = getenv("FREERDP_ASKPASS"); if (!askpass_env) askpass_env = getenv("SSH_ASKPASS");