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

make scope variables unique to avoid shadow warnings

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15614 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-07-10 05:13:09 +00:00
parent fe8d09cbc4
commit 53ac3a20b2
5 changed files with 73 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/asn1/gen.c
View File

@@ -70,6 +70,20 @@ get_filename (void)
return orig_filename; return orig_filename;
} }
static int unique_number;
void
unique_reset(void)
{
unique_number = 0;
}
int
unique_get_next(void)
{
return unique_number++;
}
void void
init_generate (const char *filename, const char *base) init_generate (const char *filename, const char *base)
{ {

38
lib/asn1/gen_decode.c
View File

@@ -117,6 +117,8 @@ decode_type (const char *name, const Type *t)
case TSequence: { case TSequence: {
Member *m; Member *m;
int tag = -1; int tag = -1;
int fd_counter = unique_get_next();
int fd_counter_inner = unique_get_next();
if (t->members == NULL) if (t->members == NULL)
break; break;
@@ -126,9 +128,10 @@ decode_type (const char *name, const Type *t)
"&reallen, &l);\n" "&reallen, &l);\n"
"FORW;\n" "FORW;\n"
"{\n" "{\n"
"int dce_fix;\n" "int dce_fix%d;\n"
"if((dce_fix = fix_dce(reallen, &len)) < 0)\n" "if((dce_fix%d = fix_dce(reallen, &len)) < 0)\n"
"return ASN1_BAD_FORMAT;\n"); "return ASN1_BAD_FORMAT;\n",
fd_counter, fd_counter);
for (m = t->members; m && tag != m->val; m = m->next) { for (m = t->members; m && tag != m->val; m = m->next) {
char *s; char *s;
@@ -180,24 +183,27 @@ decode_type (const char *name, const Type *t)
"FORW;\n" "FORW;\n"
"{\n" "{\n"
"int dce_fix;\n" "int dce_fix%d;\n"
"oldlen = len;\n" "oldlen = len;\n"
"if((dce_fix = fix_dce(newlen, &len)) < 0)" "if((dce_fix%d = fix_dce(newlen, &len)) < 0)"
"return ASN1_BAD_FORMAT;\n"); "return ASN1_BAD_FORMAT;\n",
fd_counter_inner,
fd_counter_inner);
if (m->optional) if (m->optional)
fprintf (codefile, fprintf (codefile,
"%s = malloc(sizeof(*%s));\n" "%s = malloc(sizeof(*%s));\n"
"if(%s == NULL) return ENOMEM;\n", s, s, s); "if(%s == NULL) return ENOMEM;\n", s, s, s);
decode_type (s, m->type); decode_type (s, m->type);
fprintf (codefile, fprintf (codefile,
"if(dce_fix){\n" "if(dce_fix%d){\n"
"e = der_match_tag_and_length (p, len, " "e = der_match_tag_and_length (p, len, "
"(Der_class)0, (Der_type)0, 0, &reallen, &l);\n" "(Der_class)0, (Der_type)0, 0, &reallen, &l);\n"
"FORW;\n" "FORW;\n"
"}else \n" "}else \n"
"len = oldlen - newlen;\n" "len = oldlen - newlen;\n"
"}\n" "}\n"
"}\n"); "}\n",
fd_counter_inner);
fprintf (codefile, fprintf (codefile,
"}\n"); "}\n");
} }
@@ -206,17 +212,19 @@ decode_type (const char *name, const Type *t)
free (s); free (s);
} }
fprintf(codefile, fprintf(codefile,
"if(dce_fix){\n" "if(dce_fix%d){\n"
"e = der_match_tag_and_length (p, len, " "e = der_match_tag_and_length (p, len, "
"(Der_class)0, (Der_type)0, 0, &reallen, &l);\n" "(Der_class)0, (Der_type)0, 0, &reallen, &l);\n"
"FORW;\n" "FORW;\n"
"}\n" "}\n"
"}\n"); "}\n",
fd_counter);
break; break;
} }
case TSequenceOf: { case TSequenceOf: {
char *n; char *n;
int oldret_counter = unique_get_next();
fprintf (codefile, fprintf (codefile,
"e = der_match_tag_and_length (p, len, ASN1_C_UNIV, CONS, UT_Sequence," "e = der_match_tag_and_length (p, len, ASN1_C_UNIV, CONS, UT_Sequence,"
@@ -229,21 +237,22 @@ decode_type (const char *name, const Type *t)
fprintf (codefile, fprintf (codefile,
"{\n" "{\n"
"size_t origlen = len;\n" "size_t origlen = len;\n"
"int oldret = ret;\n" "int oldret%d = ret;\n"
"ret = 0;\n" "ret = 0;\n"
"(%s)->len = 0;\n" "(%s)->len = 0;\n"
"(%s)->val = NULL;\n" "(%s)->val = NULL;\n"
"while(ret < origlen) {\n" "while(ret < origlen) {\n"
"(%s)->len++;\n" "(%s)->len++;\n"
"(%s)->val = realloc((%s)->val, sizeof(*((%s)->val)) * (%s)->len);\n", "(%s)->val = realloc((%s)->val, sizeof(*((%s)->val)) * (%s)->len);\n",
name, name, name, name, name, name, name); oldret_counter, name, name, name, name, name, name, name);
asprintf (&n, "&(%s)->val[(%s)->len-1]", name, name); asprintf (&n, "&(%s)->val[(%s)->len-1]", name, name);
decode_type (n, t->subtype); decode_type (n, t->subtype);
fprintf (codefile, fprintf (codefile,
"len = origlen - ret;\n" "len = origlen - ret;\n"
"}\n" "}\n"
"ret += oldret;\n" "ret += oldret%d;\n"
"}\n"); "}\n",
oldret_counter);
free (n); free (n);
break; break;
} }
@@ -292,6 +301,7 @@ decode_type (const char *name, const Type *t)
void void
generate_type_decode (const Symbol *s) generate_type_decode (const Symbol *s)
{ {
unique_reset();
fprintf (headerfile, fprintf (headerfile,
"int " "int "
"decode_%s(const unsigned char *, size_t, %s *, size_t *);\n", "decode_%s(const unsigned char *, size_t, %s *, size_t *);\n",

24
lib/asn1/gen_encode.c
View File

@@ -138,6 +138,7 @@ encode_type (const char *name, const Type *t)
case TSequence: { case TSequence: {
Member *m; Member *m;
int tag = -1; int tag = -1;
int oldret_counter = unique_get_next();
if (t->members == NULL) if (t->members == NULL)
break; break;
@@ -152,8 +153,9 @@ encode_type (const char *name, const Type *t)
s); s);
#if 1 #if 1
fprintf (codefile, "{\n" fprintf (codefile, "{\n"
"int oldret = ret;\n" "int oldret%d = ret;\n"
"ret = 0;\n"); "ret = 0;\n",
oldret_counter);
#endif #endif
encode_type (s, m->type); encode_type (s, m->type);
fprintf (codefile, fprintf (codefile,
@@ -163,8 +165,9 @@ encode_type (const char *name, const Type *t)
m->val); m->val);
#if 1 #if 1
fprintf (codefile, fprintf (codefile,
"ret += oldret;\n" "ret += oldret%d;\n"
"}\n"); "}\n",
oldret_counter);
#endif #endif
if (tag == -1) if (tag == -1)
tag = m->val; tag = m->val;
@@ -176,26 +179,31 @@ encode_type (const char *name, const Type *t)
break; break;
} }
case TSequenceOf: { case TSequenceOf: {
int oldret_counter = unique_get_next();
char *n; char *n;
fprintf (codefile, fprintf (codefile,
"for(i = (%s)->len - 1; i >= 0; --i) {\n" "for(i = (%s)->len - 1; i >= 0; --i) {\n"
#if 1 #if 1
"int oldret = ret;\n" "int oldret%d = ret;\n"
"ret = 0;\n", "ret = 0;\n",
#else #else
, ,
#endif #endif
name); name, oldret_counter);
asprintf (&n, "&(%s)->val[i]", name); asprintf (&n, "&(%s)->val[i]", name);
encode_type (n, t->subtype); encode_type (n, t->subtype);
fprintf (codefile, fprintf (codefile,
#if 1 #if 1
"ret += oldret;\n" "ret += oldret%d;\n"
#endif #endif
"}\n" "}\n"
"e = der_put_length_and_tag (p, len, ret, ASN1_C_UNIV, CONS, UT_Sequence, &l);\n" "e = der_put_length_and_tag (p, len, ret, ASN1_C_UNIV, CONS, UT_Sequence, &l);\n"
"BACK;\n"); "BACK;\n"
#if 1
, oldret_counter
#endif
);
free (n); free (n);
break; break;
} }

28
lib/asn1/gen_length.c
View File

@@ -89,6 +89,7 @@ length_type (const char *name, const Type *t, const char *variable)
case TSequence: { case TSequence: {
Member *m; Member *m;
int tag = -1; int tag = -1;
int oldret_counter = unique_get_next();
if (t->members == NULL) if (t->members == NULL)
break; break;
@@ -101,11 +102,11 @@ length_type (const char *name, const Type *t, const char *variable)
if (m->optional) if (m->optional)
fprintf (codefile, "if(%s)", s); fprintf (codefile, "if(%s)", s);
fprintf (codefile, "{\n" fprintf (codefile, "{\n"
"int oldret = %s;\n" "int oldret%d = %s;\n"
"%s = 0;\n", variable, variable); "%s = 0;\n", oldret_counter, variable, variable);
length_type (s, m->type, "ret"); length_type (s, m->type, "ret");
fprintf (codefile, "%s += 1 + length_len(%s) + oldret;\n", fprintf (codefile, "%s += 1 + length_len(%s) + oldret%d;\n",
variable, variable); variable, variable, oldret_counter);
fprintf (codefile, "}\n"); fprintf (codefile, "}\n");
if (tag == -1) if (tag == -1)
tag = m->val; tag = m->val;
@@ -117,26 +118,28 @@ length_type (const char *name, const Type *t, const char *variable)
} }
case TSequenceOf: { case TSequenceOf: {
char *n; char *n;
int oldret_counter = unique_get_next();
int oldret_counter_inner = unique_get_next();
fprintf (codefile, fprintf (codefile,
"{\n" "{\n"
"int oldret = %s;\n" "int oldret%d = %s;\n"
"int i;\n" "int i;\n"
"%s = 0;\n", "%s = 0;\n",
variable, variable); oldret_counter, variable, variable);
fprintf (codefile, "for(i = (%s)->len - 1; i >= 0; --i){\n", name); fprintf (codefile, "for(i = (%s)->len - 1; i >= 0; --i){\n", name);
fprintf (codefile, "int oldret = %s;\n" fprintf (codefile, "int oldret%d = %s;\n"
"%s = 0;\n", variable, variable); "%s = 0;\n", oldret_counter_inner, variable, variable);
asprintf (&n, "&(%s)->val[i]", name); asprintf (&n, "&(%s)->val[i]", name);
length_type(n, t->subtype, variable); length_type(n, t->subtype, variable);
fprintf (codefile, "%s += oldret;\n", fprintf (codefile, "%s += oldret%d;\n",
variable); variable, oldret_counter_inner);
fprintf (codefile, "}\n"); fprintf (codefile, "}\n");
fprintf (codefile, fprintf (codefile,
"%s += 1 + length_len(%s) + oldret;\n" "%s += 1 + length_len(%s) + oldret%d;\n"
"}\n", variable, variable); "}\n", variable, variable, oldret_counter);
free(n); free(n);
break; break;
} }
@@ -167,6 +170,7 @@ length_type (const char *name, const Type *t, const char *variable)
void void
generate_type_length (const Symbol *s) generate_type_length (const Symbol *s)
{ {
unique_reset();
fprintf (headerfile, fprintf (headerfile,
"size_t length_%s(const %s *);\n", "size_t length_%s(const %s *);\n",
s->gen_name, s->gen_name); s->gen_name, s->gen_name);

3
lib/asn1/gen_locl.h
View File

@@ -63,6 +63,9 @@ void generate_type_copy (const Symbol *s);
void generate_type_maybe (const Symbol *s); void generate_type_maybe (const Symbol *s);
void generate_glue (const Symbol *s); void generate_glue (const Symbol *s);
void unique_reset(void);
int unique_get_next(void);
void init_generate (const char *filename, const char *basename); void init_generate (const char *filename, const char *basename);
const char *get_filename (void); const char *get_filename (void);
void close_generate(void); void close_generate(void);