oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Rename str to oid in the function namespace to avoid -Wshadow warning

Browse Source 
Based on a report from Matthias Dieter Wallnöfer.
This commit is contained in:
Love Hornquist Astrand
2009-10-03 11:35:45 -07:00
parent ce0293b994
commit 7b999148f8
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/hx509/name.c
View File

@@ -925,12 +925,12 @@ hx509_general_name_unparse(GeneralName *name, char **str)
switch (name->element) { switch (name->element) {
case choice_GeneralName_otherName: { case choice_GeneralName_otherName: {
char *str; char *oid;
hx509_oid_sprint(&name->u.otherName.type_id, &str); hx509_oid_sprint(&name->u.otherName.type_id, &oid);
if (str == NULL) if (oid == NULL)
return ENOMEM; return ENOMEM;
strpool = rk_strpoolprintf(strpool, "otherName: %s", str); strpool = rk_strpoolprintf(strpool, "otherName: %s", oid);
free(str); free(oid);
break; break;
} }
case choice_GeneralName_rfc822Name: case choice_GeneralName_rfc822Name:
@@ -985,12 +985,12 @@ hx509_general_name_unparse(GeneralName *name, char **str)
break; break;
} }
case choice_GeneralName_registeredID: { case choice_GeneralName_registeredID: {
char *str; char *oid;
hx509_oid_sprint(&name->u.registeredID, &str); hx509_oid_sprint(&name->u.registeredID, &oid);
if (str == NULL) if (oid == NULL)
return ENOMEM; return ENOMEM;
strpool = rk_strpoolprintf(strpool, "registeredID: %s", str); strpool = rk_strpoolprintf(strpool, "registeredID: %s", oid);
free(str); free(oid);
break; break;
} }
default: default: