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

rename to avoid shadowing

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15440 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-06-16 20:03:38 +00:00
parent 491a812d67
commit 622777b1ce
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/asn1/gen_copy.c
View File

@@ -77,27 +77,27 @@ copy_type (const char *from, const char *to, const Type *t)
break; break;
for (m = t->members; m && tag != m->val; m = m->next) { for (m = t->members; m && tag != m->val; m = m->next) {
char *f; char *fn;
char *t; char *tn;
asprintf (&f, "%s(%s)->%s", asprintf (&fn, "%s(%s)->%s",
m->optional ? "" : "&", from, m->gen_name); m->optional ? "" : "&", from, m->gen_name);
asprintf (&t, "%s(%s)->%s", asprintf (&tn, "%s(%s)->%s",
m->optional ? "" : "&", to, m->gen_name); m->optional ? "" : "&", to, m->gen_name);
if(m->optional){ if(m->optional){
fprintf(codefile, "if(%s) {\n", f); fprintf(codefile, "if(%s) {\n", fn);
fprintf(codefile, "%s = malloc(sizeof(*%s));\n", t, t); fprintf(codefile, "%s = malloc(sizeof(*%s));\n", tn, tn);
fprintf(codefile, "if(%s == NULL) return ENOMEM;\n", t); fprintf(codefile, "if(%s == NULL) return ENOMEM;\n", tn);
} }
copy_type (f, t, m->type); copy_type (fn, tn, m->type);
if(m->optional){ if(m->optional){
fprintf(codefile, "}else\n"); fprintf(codefile, "}else\n");
fprintf(codefile, "%s = NULL;\n", t); fprintf(codefile, "%s = NULL;\n", tn);
} }
if (tag == -1) if (tag == -1)
tag = m->val; tag = m->val;
free (f); free (fn);
free (t); free (tn);
} }
break; break;
} }