wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Address style issues.

Browse source 
Refactor count -> c which makes the for loop more readable.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3710)
This commit is contained in:
Pauli 2017-06-20 07:58:51 +10:00 committed by Rich Salz
parent a7b68c5b24
commit 4f58c6b9fe
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
test/x509aux.c
View file

@ -25,7 +25,7 @@ static char **files;
static int test_certs(int num) static int test_certs(int num)
{ {
int count; int c;
char *name = 0; char *name = 0;
char *header = 0; char *header = 0;
unsigned char *data = 0; unsigned char *data = 0;
@ -38,10 +38,9 @@ static int test_certs(int num)
if (!TEST_ptr(fp)) if (!TEST_ptr(fp))
return 0; return 0;
for (count = 0; for (c = 0; !err && PEM_read_bio(fp, &name, &header, &data, &len); ++c) {
!err && PEM_read_bio(fp, &name, &header, &data, &len); const int trusted = (strcmp(name, PEM_STRING_X509_TRUSTED) == 0);
++count) {
int trusted = strcmp(name, PEM_STRING_X509_TRUSTED) == 0;
d2i_X509_t d2i = trusted ? d2i_X509_AUX : d2i_X509; d2i_X509_t d2i = trusted ? d2i_X509_AUX : d2i_X509;
i2d_X509_t i2d = trusted ? i2d_X509_AUX : i2d_X509; i2d_X509_t i2d = trusted ? i2d_X509_AUX : i2d_X509;
X509 *cert = NULL; X509 *cert = NULL;
@ -147,7 +146,7 @@ static int test_certs(int num)
if (ERR_GET_REASON(ERR_peek_last_error()) == PEM_R_NO_START_LINE) { if (ERR_GET_REASON(ERR_peek_last_error()) == PEM_R_NO_START_LINE) {
/* Reached end of PEM file */ /* Reached end of PEM file */
if (count > 0) { if (c > 0) {
ERR_clear_error(); ERR_clear_error();
return 1; return 1;
} }