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

Avoid shadowing.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17576 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-05-13 20:51:59 +00:00
parent b00495b53b
commit a848124aa0
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

@@ -177,13 +177,13 @@ hx509_name_to_string(const hx509_name name, char **str)
break; break;
case choice_DirectoryString_bmpString: { case choice_DirectoryString_bmpString: {
uint16_t *bmp = ds->u.bmpString.data; uint16_t *bmp = ds->u.bmpString.data;
size_t len = ds->u.bmpString.length; size_t bmplen = ds->u.bmpString.length;
int k; size_t k;
ss = malloc(len + 1); ss = malloc(bmplen + 1);
if (ss == NULL) if (ss == NULL)
_hx509_abort("allocation failure"); /* XXX */ _hx509_abort("allocation failure"); /* XXX */
for (k = 0; k < len; k++) for (k = 0; k < bmplen; k++)
ss[k] = bmp[k] & 0xff; /* XXX */ ss[k] = bmp[k] & 0xff; /* XXX */
ss[k] = '\0'; ss[k] = '\0';
break; break;
@@ -319,7 +319,6 @@ int
hx509_parse_name(const char *str, hx509_name *name) hx509_parse_name(const char *str, hx509_name *name)
{ {
const char *p, *q; const char *p, *q;
char *r;
size_t len; size_t len;
hx509_name n; hx509_name n;
void *ptr; void *ptr;
@@ -399,16 +398,17 @@ hx509_parse_name(const char *str, hx509_name *name)
} }
{ {
size_t strlen = len - (q - p) - 1; size_t pstr_len = len - (q - p) - 1;
const char *str = p + (q - p) + 1; const char *pstr = p + (q - p) + 1;
char *r;
r = malloc(strlen + 1); r = malloc(pstr_len + 1);
if (r == NULL) { if (r == NULL) {
/* _hx509_abort("malloc"); */ /* _hx509_abort("malloc"); */
goto out; goto out;
} }
memcpy(r, str, strlen); memcpy(r, pstr, pstr_len);
r[strlen] = '\0'; r[pstr_len] = '\0';
rdn->val[0].value.element = choice_DirectoryString_printableString; rdn->val[0].value.element = choice_DirectoryString_printableString;
rdn->val[0].value.u.printableString = r; rdn->val[0].value.u.printableString = r;