diff options
author | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2009-09-29 11:43:17 +0200 |
---|---|---|
committer | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2009-10-03 13:20:52 +0200 |
commit | 02b289f65bf567acb233ad01e3512a9e29b6c757 (patch) | |
tree | 8b43ee2bd1fa1811ec999555a04296ff5e2d3156 /source4/heimdal/lib/hx509/ks_file.c | |
parent | be938ab44b6095818501b23ca8422c731e14015a (diff) | |
download | samba-02b289f65bf567acb233ad01e3512a9e29b6c757.tar.gz samba-02b289f65bf567acb233ad01e3512a9e29b6c757.tar.bz2 samba-02b289f65bf567acb233ad01e3512a9e29b6c757.zip |
heimdal - fix various warnings
- Shadowed variables
- "const" related warnings
- Parameter names which shadow function declarations
- Non-void functions which have no return value
(patch also ported upstream)
Diffstat (limited to 'source4/heimdal/lib/hx509/ks_file.c')
-rw-r--r-- | source4/heimdal/lib/hx509/ks_file.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/heimdal/lib/hx509/ks_file.c b/source4/heimdal/lib/hx509/ks_file.c index 553191a774..3955820aef 100644 --- a/source4/heimdal/lib/hx509/ks_file.c +++ b/source4/heimdal/lib/hx509/ks_file.c @@ -413,24 +413,24 @@ file_init_common(hx509_context context, goto out; for (p = f->fn; p != NULL; p = pnext) { - FILE *f; + FILE *f2; pnext = strchr(p, ','); if (pnext) *pnext++ = '\0'; - if ((f = fopen(p, "r")) == NULL) { + if ((f2 = fopen(p, "r")) == NULL) { ret = ENOENT; hx509_set_error_string(context, 0, ret, "Failed to open PEM file \"%s\": %s", p, strerror(errno)); goto out; } - rk_cloexec_file(f); + rk_cloexec_file(f2); - ret = hx509_pem_read(context, f, pem_func, &pem_ctx); - fclose(f); + ret = hx509_pem_read(context, f2, pem_func, &pem_ctx); + fclose(f2); if (ret != 0 && ret != HX509_PARSING_KEY_FAILED) goto out; else if (ret == HX509_PARSING_KEY_FAILED) { |