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/name.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/name.c')
-rw-r--r-- | source4/heimdal/lib/hx509/name.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source4/heimdal/lib/hx509/name.c b/source4/heimdal/lib/hx509/name.c index 23736edde3..546b749015 100644 --- 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: |