2
0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 14:25:26 +00:00

Don't shadow variables.

Rename the remaining variables that were shadowing another definition.

Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
This commit is contained in:
Justin Pettit
2018-02-27 17:34:14 -08:00
parent 84b99a0490
commit 396d492cfa
11 changed files with 99 additions and 106 deletions

View File

@@ -1247,12 +1247,12 @@ read_cert_file(const char *file_name, X509 ***certs, size_t *n_certs)
}
for (;;) {
X509 *certificate;
X509 *cert;
int c;
/* Read certificate from file. */
certificate = PEM_read_X509(file, NULL, NULL, NULL);
if (!certificate) {
cert = PEM_read_X509(file, NULL, NULL, NULL);
if (!cert) {
size_t i;
VLOG_ERR("PEM_read_X509 failed reading %s: %s",
@@ -1271,7 +1271,7 @@ read_cert_file(const char *file_name, X509 ***certs, size_t *n_certs)
if (*n_certs >= allocated_certs) {
*certs = x2nrealloc(*certs, &allocated_certs, sizeof **certs);
}
(*certs)[(*n_certs)++] = certificate;
(*certs)[(*n_certs)++] = cert;
/* Are there additional certificates in the file? */
do {