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

Use err' and asprintf'

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2272 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-07-14 11:38:28 +00:00
parent 48011fae6a
commit 5b1f9fc01c
5 changed files with 71 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/asn1/gen_copy.c
View File

@@ -36,11 +36,13 @@ copy_type (char *from, char *to, 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 = malloc(2 + strlen(from) + 1 + strlen(m->gen_name) + 3); char *f;
char *t = malloc(2 + strlen(to) + 1 + strlen(m->gen_name) + 3); char *t;
sprintf (f, "%s(%s)->%s", m->optional ? "" : "&", from, m->gen_name); asprintf (&f, "%s(%s)->%s",
sprintf (t, "%s(%s)->%s", m->optional ? "" : "&", to, m->gen_name); m->optional ? "" : "&", from, m->gen_name);
asprintf (&t, "%s(%s)->%s",
m->optional ? "" : "&", to, m->gen_name);
if(m->optional){ if(m->optional){
fprintf(codefile, "if(%s) {\n", f); fprintf(codefile, "if(%s) {\n", f);
fprintf(codefile, "%s = malloc(sizeof(*%s));\n", t, t); fprintf(codefile, "%s = malloc(sizeof(*%s));\n", t, t);
@@ -58,15 +60,17 @@ copy_type (char *from, char *to, Type *t)
break; break;
} }
case TSequenceOf: { case TSequenceOf: {
char *f = malloc(strlen(from) + strlen(to) + 17); char *f;
char *T = malloc(strlen(to) + strlen(to) + 17); char *T;
fprintf (codefile, "(%s)->val = " fprintf (codefile, "(%s)->val = "
"malloc((%s)->len * sizeof(*(%s)->val));\n", "malloc((%s)->len * sizeof(*(%s)->val));\n",
to, from, to); to, from, to);
fprintf(codefile, "for((%s)->len = 0; (%s)->len < (%s)->len; (%s)->len++){\n", to, to, from, to); fprintf(codefile,
sprintf(f, "&(%s)->val[(%s)->len]", from, to); "for((%s)->len = 0; (%s)->len < (%s)->len; (%s)->len++){\n",
sprintf(T, "&(%s)->val[(%s)->len]", to, to); to, to, from, to);
asprintf(&f, "&(%s)->val[(%s)->len]", from, to);
asprintf(&T, "&(%s)->val[(%s)->len]", to, to);
copy_type(f, T, t->subtype); copy_type(f, T, t->subtype);
fprintf(codefile, "}\n"); fprintf(codefile, "}\n");
free(f); free(f);

88
lib/asn1/gen_decode.c
View File

@@ -80,9 +80,9 @@ decode_type (char *name, Type *t)
"return ASN1_BAD_FORMAT;\n"); "return ASN1_BAD_FORMAT;\n");
for (m = t->members; m && tag != m->val; m = m->next) { for (m = t->members; m && tag != m->val; m = m->next) {
char *s = malloc(2 + strlen(name) + 1 + strlen(m->gen_name) + 3); char *s;
sprintf (s, "%s(%s)->%s", m->optional ? "" : "&", name, m->gen_name); asprintf (&s, "%s(%s)->%s", m->optional ? "" : "&", name, m->gen_name);
if (0 && m->type->type == TType){ if (0 && m->type->type == TType){
if(m->optional) if(m->optional)
fprintf (codefile, fprintf (codefile,
@@ -105,49 +105,49 @@ decode_type (char *name, Type *t)
fprintf (codefile, "FORW;\n"); fprintf (codefile, "FORW;\n");
}else{ }else{
fprintf (codefile, "{\n" fprintf (codefile, "{\n"
"size_t newlen, oldlen;\n\n" "size_t newlen, oldlen;\n\n"
"e = der_match_tag (p, len, CONTEXT, CONS, %d, &l);\n", "e = der_match_tag (p, len, CONTEXT, CONS, %d, &l);\n",
m->val); m->val);
fprintf (codefile,
"if (e)\n");
if(m->optional)
/* XXX should look at e */
fprintf (codefile, fprintf (codefile,
"%s = NULL;\n", s); "if (e)\n");
else if(m->optional)
/* XXX should look at e */
fprintf (codefile,
"%s = NULL;\n", s);
else
fprintf (codefile,
"return e;\n");
fprintf (codefile,
"else {\n");
fprintf (codefile, fprintf (codefile,
"return e;\n"); "p += l;\n"
fprintf (codefile, "len -= l;\n"
"else {\n"); "ret += l;\n"
fprintf (codefile, "e = der_get_length (p, len, &newlen, &l);\n"
"p += l;\n" "FORW;\n"
"len -= l;\n" "{\n"
"ret += l;\n"
"e = der_get_length (p, len, &newlen, &l);\n"
"FORW;\n"
"{\n"
"int dce_fix;\n" "int dce_fix;\n"
"oldlen = len;\n" "oldlen = len;\n"
"if((dce_fix = fix_dce(newlen, &len)) < 0)" "if((dce_fix = fix_dce(newlen, &len)) < 0)"
"return ASN1_BAD_FORMAT;\n"); "return ASN1_BAD_FORMAT;\n");
if (m->optional) if (m->optional)
fprintf (codefile, fprintf (codefile,
"%s = malloc(sizeof(*%s));\n", "%s = malloc(sizeof(*%s));\n",
s, s); s, s);
decode_type (s, m->type); decode_type (s, m->type);
fprintf (codefile, fprintf (codefile,
"if(dce_fix){\n" "if(dce_fix){\n"
"e = der_match_tag_and_length (p, len, 0, 0, 0, " "e = der_match_tag_and_length (p, len, 0, 0, 0, "
"&reallen, &l);\n" "&reallen, &l);\n"
"FORW;\n" "FORW;\n"
"}else \n" "}else \n"
"len = oldlen - newlen;\n" "len = oldlen - newlen;\n"
"}\n" "}\n"
"}\n"); "}\n");
fprintf (codefile, fprintf (codefile,
"}\n"); "}\n");
} }
if (tag == -1) if (tag == -1)
tag = m->val; tag = m->val;
@@ -163,7 +163,7 @@ decode_type (char *name, Type *t)
break; break;
} }
case TSequenceOf: { case TSequenceOf: {
char *n = malloc(2*strlen(name) + 20); char *n;
fprintf (codefile, fprintf (codefile,
"e = der_match_tag_and_length (p, len, UNIV, CONS, UT_Sequence," "e = der_match_tag_and_length (p, len, UNIV, CONS, UT_Sequence,"
@@ -180,7 +180,7 @@ decode_type (char *name, Type *t)
"(%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); name, name, name, name, name, name, name);
sprintf (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,
"}\n"); "}\n");

8
lib/asn1/gen_encode.c
View File

@@ -91,9 +91,9 @@ encode_type (char *name, Type *t)
break; break;
for (m = t->members->prev; m && tag != m->val; m = m->prev) { for (m = t->members->prev; m && tag != m->val; m = m->prev) {
char *s = malloc(2 + strlen(name) + 1 + strlen(m->gen_name) + 3); char *s;
sprintf (s, "%s(%s)->%s", m->optional ? "" : "&", name, m->gen_name); asprintf (&s, "%s(%s)->%s", m->optional ? "" : "&", name, m->gen_name);
if (m->optional) if (m->optional)
fprintf (codefile, fprintf (codefile,
"if(%s)\n", "if(%s)\n",
@@ -124,7 +124,7 @@ encode_type (char *name, Type *t)
break; break;
} }
case TSequenceOf: { case TSequenceOf: {
char *n = malloc(strlen(name) + 12); char *n;
fprintf (codefile, fprintf (codefile,
"for(i = (%s)->len - 1; i >= 0; --i) {\n" "for(i = (%s)->len - 1; i >= 0; --i) {\n"
@@ -135,7 +135,7 @@ encode_type (char *name, Type *t)
, ,
#endif #endif
name); name);
sprintf (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

9
lib/asn1/gen_free.c
View File

@@ -34,9 +34,10 @@ free_type (char *name, 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 *s = malloc(2 + strlen(name) + 1 + strlen(m->gen_name) + 3); char *s;
sprintf (s, "%s(%s)->%s", m->optional ? "" : "&", name, m->gen_name); asprintf (&s, "%s(%s)->%s",
m->optional ? "" : "&", name, m->gen_name);
if(m->optional) if(m->optional)
fprintf(codefile, "if(%s) {\n", s); fprintf(codefile, "if(%s) {\n", s);
free_type (s, m->type); free_type (s, m->type);
@@ -51,10 +52,10 @@ free_type (char *name, Type *t)
break; break;
} }
case TSequenceOf: { case TSequenceOf: {
char *n = malloc(2*strlen(name) + 20); char *n;
fprintf (codefile, "while((%s)->len){\n", name); fprintf (codefile, "while((%s)->len){\n", name);
sprintf (n, "&(%s)->val[(%s)->len-1]", name, name); asprintf (&n, "&(%s)->val[(%s)->len-1]", name, name);
free_type(n, t->subtype); free_type(n, t->subtype);
fprintf(codefile, fprintf(codefile,
"(%s)->len--;\n" "(%s)->len--;\n"

9
lib/asn1/gen_length.c
View File

@@ -41,9 +41,10 @@ length_type (char *name, Type *t, char *variable)
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 *s = malloc(2 + strlen(name) + 1 + strlen(m->gen_name) + 3); char *s;
sprintf (s, "%s(%s)->%s", m->optional ? "" : "&", name, m->gen_name); asprintf (&s, "%s(%s)->%s",
m->optional ? "" : "&", name, m->gen_name);
if (m->optional) if (m->optional)
fprintf (codefile, "if(%s)", s); fprintf (codefile, "if(%s)", s);
fprintf (codefile, "{\n" fprintf (codefile, "{\n"
@@ -62,7 +63,7 @@ length_type (char *name, Type *t, char *variable)
break; break;
} }
case TSequenceOf: { case TSequenceOf: {
char *n = malloc(2*strlen(name) + 20); char *n;
fprintf (codefile, fprintf (codefile,
"{\n" "{\n"
@@ -72,7 +73,7 @@ length_type (char *name, Type *t, char *variable)
variable, variable); 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);
sprintf (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, "}\n"); fprintf (codefile, "}\n");