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)

diff --git a/source4/heimdal/kuser/kinit.c b/source4/heimdal/kuser/kinit.c
index 4208fa83e0ca5eb8e89fd78d3c09370773db65bf..dd122b5ce73c4f0ec50fa973b1d8f15971be22e5 100644 (file)
--- a/source4/heimdal/kuser/kinit.c
+++ b/source4/heimdal/kuser/kinit.c
@@ -488,14 +488,14 @@ get_new_tickets(krb5_context context,
                                                addrs_flag ? FALSE : TRUE);
 
     if (renew_life == NULL && renewable_flag)
-       renewstr = "1 month";
+       asprintf(&renewstr, "1 month");
     if (renew_life)
-       renewstr = renew_life;
+       asprintf(&renewstr, "%s", renew_life);
     if (renewstr) {
        renew = parse_time (renewstr, "s");
        if (renew < 0)
            errx (1, "unparsable time: %s", renewstr);
-       
+       free(renewstr);
        krb5_get_init_creds_opt_set_renew_life (opt, renew);
     }
 

diff --git a/source4/heimdal/lib/hx509/ca.c b/source4/heimdal/lib/hx509/ca.c
index 624d74289df701332a286aae4bbe474cf5911543..95f206f1956bcf37ff4ecb44ea33e77e602ce48e 100644 (file)
--- a/source4/heimdal/lib/hx509/ca.c
+++ b/source4/heimdal/lib/hx509/ca.c
@@ -692,7 +692,7 @@ add_utf8_san(hx509_context context,
             const heim_oid *oid,
             const char *string)
 {
-    const PKIXXmppAddr ustring = (const PKIXXmppAddr)string;
+    const PKIXXmppAddr ustring = string;
     heim_octet_string os;
     size_t size;
     int ret;

diff --git a/source4/heimdal/lib/hx509/cert.c b/source4/heimdal/lib/hx509/cert.c
index cd9ae01fac06ac23bf693296e3b52d9e50c94807..7eda0eba48689926d591e8aef194ffcf39d2eade 100644 (file)
--- a/source4/heimdal/lib/hx509/cert.c
+++ b/source4/heimdal/lib/hx509/cert.c
@@ -3383,7 +3383,6 @@ _hx509_cert_to_env(hx509_context context, hx509_cert cert, hx509_env *env)
        Certificate *c = _hx509_get_cert(cert);
         heim_octet_string os, sig;
        hx509_env envhash = NULL;
-       char *buf;
 
        os.data = c->tbsCertificate.subjectPublicKeyInfo.subjectPublicKey.data;
        os.length =

diff --git a/source4/heimdal/lib/hx509/file.c b/source4/heimdal/lib/hx509/file.c
index ba7a23f471238442067f998febf47372e84b1bc3..674d2706ce0c3d9c0919b392515ce613755db709 100644 (file)
--- a/source4/heimdal/lib/hx509/file.c
+++ b/source4/heimdal/lib/hx509/file.c
@@ -121,14 +121,14 @@ hx509_pem_write(hx509_context context, const char *type,
 
 int
 hx509_pem_add_header(hx509_pem_header **headers,
-                    const char *header, const char *value)
+                    const char *hdr, const char *value)
 {
     hx509_pem_header *h;
 
     h = calloc(1, sizeof(*h));
     if (h == NULL)
        return ENOMEM;
-    h->header = strdup(header);
+    h->header = strdup(hdr);
     if (h->header == NULL) {
        free(h);
        return ENOMEM;
@@ -164,10 +164,10 @@ hx509_pem_free_header(hx509_pem_header *headers)
  */
 
 const char *
-hx509_pem_find_header(const hx509_pem_header *h, const char *header)
+hx509_pem_find_header(const hx509_pem_header *h, const char *hdr)
 {
     while(h) {
-       if (strcmp(header, h->header) == 0)
+       if (strcmp(hdr, h->header) == 0)
            return h->value;
        h = h->next;
     }

diff --git a/source4/heimdal/lib/hx509/ks_file.c b/source4/heimdal/lib/hx509/ks_file.c
index 553191a774c918bc8e93e9624d012b88250fa7c9..3955820aef213c624c71f18bfa13cfe7b20656db 100644 (file)
--- 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) {

diff --git a/source4/heimdal/lib/hx509/name.c b/source4/heimdal/lib/hx509/name.c
index 23736edde3b551a11da9bcbe25a5a078257ede0f..546b7490157d36c20ca14cd17e40c8afd2d4703a 100644 (file)
--- a/source4/heimdal/lib/hx509/name.c
+++ b/source4/heimdal/lib/hx509/name.c
@@ -926,12 +926,12 @@ hx509_general_name_unparse(GeneralName *name, char **str)
 
     switch (name->element) {
     case choice_GeneralName_otherName: {
-       char *str;
-       hx509_oid_sprint(&name->u.otherName.type_id, &str);
-       if (str == NULL)
+       char *str2;
+       hx509_oid_sprint(&name->u.otherName.type_id, &str2);
+       if (str2 == NULL)
            return ENOMEM;
-       strpool = rk_strpoolprintf(strpool, "otherName: %s", str);
-       free(str);
+       strpool = rk_strpoolprintf(strpool, "otherName: %s", str2);
+       free(str2);
        break;
     }
     case choice_GeneralName_rfc822Name:
@@ -986,12 +986,12 @@ hx509_general_name_unparse(GeneralName *name, char **str)
        break;
     }
     case choice_GeneralName_registeredID: {
-       char *str;
-       hx509_oid_sprint(&name->u.registeredID, &str);
-       if (str == NULL)
+       char *str2;
+       hx509_oid_sprint(&name->u.registeredID, &str2);
+       if (str2 == NULL)
            return ENOMEM;
-       strpool = rk_strpoolprintf(strpool, "registeredID: %s", str);
-       free(str);
+       strpool = rk_strpoolprintf(strpool, "registeredID: %s", str2);
+       free(str2);
        break;
     }
     default:

diff --git a/source4/heimdal/lib/hx509/sel.c b/source4/heimdal/lib/hx509/sel.c
index 5932ce84c3d4020c24987365221ceca131a48e7c..c5e760569a9b318aa96b64b9a516cf6f09f5233b 100644 (file)
--- a/source4/heimdal/lib/hx509/sel.c
+++ b/source4/heimdal/lib/hx509/sel.c
@@ -176,6 +176,7 @@ _hx509_expr_eval(hx509_context context, hx509_env env, struct hx_expr *expr)
     default:
        _hx509_abort("hx509 eval expr with unknown op: %d", (int)expr->op);
     }
+    return 0;
 }
 
 void