From b00495b53b1aaac175b72ff3edac9522830e8a4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Sat, 13 May 2006 20:37:47 +0000 Subject: [PATCH] Avoid shadowing. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17575 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/hx509/ks_file.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/hx509/ks_file.c b/lib/hx509/ks_file.c index 3ad59f564..ef8fe24a4 100644 --- a/lib/hx509/ks_file.c +++ b/lib/hx509/ks_file.c @@ -288,7 +288,7 @@ parse_pem_file(hx509_context context, void *data = NULL; size_t len = 0; char buf[1024]; - int i, ret; + int ret; FILE *f; @@ -307,6 +307,7 @@ parse_pem_file(hx509_context context, while (fgets(buf, sizeof(buf), f) != NULL) { char *p; + int i; i = strcspn(buf, "\n"); if (buf[i] == '\n') { @@ -352,6 +353,7 @@ parse_pem_file(hx509_context context, break; case INDATA: indata: + if (strncmp("-----END ", buf, 9) == 0) { where = DONE; break; @@ -370,13 +372,13 @@ parse_pem_file(hx509_context context, } if (where == DONE) { - int i; + int j; ret = EINVAL; - for (i = 0; i < sizeof(formats)/sizeof(formats[0]); i++) { - const char *p = formats[i].name; - if (strncmp(type, p, strlen(p)) == 0) - ret = (*formats[i].func)(context, c, headers, data, len); + for (j = 0; j < sizeof(formats)/sizeof(formats[0]); j++) { + const char *q = formats[j].name; + if (strncmp(type, q, strlen(q)) == 0) + ret = (*formats[j].func)(context, c, headers, data, len); } free(data); data = NULL; @@ -455,16 +457,16 @@ file_init(hx509_context context, if (!found_data) { size_t length; - void *data; + void *ptr; - ret = _hx509_map_file(p, &data, &length, NULL); + ret = _hx509_map_file(p, &ptr, &length, NULL); if (ret) { hx509_clear_error_string(context); goto out; } - ret = parse_certificate(context, c, NULL, data, length); - _hx509_unmap_file(data, length); + ret = parse_certificate(context, c, NULL, ptr, length); + _hx509_unmap_file(ptr, length); if (ret) goto out; }