Commit 7fc840cc authored by Bodo Möller's avatar Bodo Möller
Browse files

Stylistic changes: Don't use a macro for the malloc'ed length since it 

is not constant.
parent 4adcfa05

apps/passwd.c

+5 −3
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ int MAIN(int argc, char **argv) 
	int in_stdin = 0;

	char *salt = NULL, *passwd = NULL, **passwds = NULL;

	char *salt_malloc = NULL, *passwd_malloc = NULL;

	size_t passwd_malloc_size = 0;

	int pw_source_defined = 0;

	BIO *in = NULL, *out = NULL;

	int i, badopt, opt_done;
@@ -196,9 +197,10 @@ int MAIN(int argc, char **argv) 
	if (passwds == NULL)

		{

		/* no passwords on the command line */

#define PASSWD_MALLOC_SIZE (pw_maxlen + 2)



		passwd_malloc_size = pw_maxlen + 2;

		/* longer than necessary so that we can warn about truncation */

		passwd = passwd_malloc = Malloc(PASSWD_MALLOC_SIZE);

		passwd = passwd_malloc = Malloc(passwd_malloc_size);

		if (passwd_malloc == NULL)

			goto err;

		}
@@ -210,7 +212,7 @@ int MAIN(int argc, char **argv) 
		

		passwds = passwds_static;

		if (in == NULL)

			if (EVP_read_pw_string(passwd_malloc, PASSWD_MALLOC_SIZE, "Password: ", 0) != 0)

			if (EVP_read_pw_string(passwd_malloc, passwd_malloc_size, "Password: ", 0) != 0)

				goto err;

		passwds[0] = passwd_malloc;

		}