Move type operations to another structure
Every type has free, print, check_constraints, ber_decoder, der_encoder,
xer_decoder, xer_encoder, uper_decoder, uper_encoder and outmost_tag
operations. We move them out to a separate structure asn_TYPE_operation_t.
Combined with previous logic simplification, these operations are based
on ASN.1 basic types, constructed types and string types. So we can
reduce the space occupied by asn_TYPE_descriptor_t variables.
diff --git a/tests/tests-c-compiler/check-src/check-119.-fwide-types.-gen-PER.c b/tests/tests-c-compiler/check-src/check-119.-fwide-types.-gen-PER.c
index ebfb4f4..f0edbb4 100644
--- a/tests/tests-c-compiler/check-src/check-119.-fwide-types.-gen-PER.c
+++ b/tests/tests-c-compiler/check-src/check-119.-fwide-types.-gen-PER.c
@@ -129,7 +129,7 @@
" chunks %zd\n",
size, fname, how==AS_PER?"PER":"XER", csize);
- if(st) asn_DEF_PDU.free_struct(&asn_DEF_PDU, st, 0);
+ if(st) ASN_STRUCT_FREE(asn_DEF_PDU, st);
st = 0;
do {
@@ -200,7 +200,7 @@
} else {
assert(rval.code != RC_OK);
fprintf(stderr, "Failed, but this was expected\n");
- asn_DEF_PDU.free_struct(&asn_DEF_PDU, st, 0);
+ ASN_STRUCT_FREE(asn_DEF_PDU, st);
st = 0; /* ignore leak for now */
}
}
@@ -289,7 +289,7 @@
break;
}
- asn_DEF_PDU.free_struct(&asn_DEF_PDU, st, 0);
+ ASN_STRUCT_FREE(asn_DEF_PDU, st);
}
/*
diff --git a/tests/tests-c-compiler/check-src/check-119.-gen-PER.c b/tests/tests-c-compiler/check-src/check-119.-gen-PER.c
index bb52eac..96ccc9f 100644
--- a/tests/tests-c-compiler/check-src/check-119.-gen-PER.c
+++ b/tests/tests-c-compiler/check-src/check-119.-gen-PER.c
@@ -129,7 +129,7 @@
" chunks %zd\n",
size, fname, how==AS_PER?"PER":"XER", csize);
- if(st) asn_DEF_PDU.free_struct(&asn_DEF_PDU, st, 0);
+ if(st) ASN_STRUCT_FREE(asn_DEF_PDU, st);
st = 0;
do {
@@ -200,7 +200,7 @@
} else {
assert(rval.code != RC_OK);
fprintf(stderr, "Failed, but this was expected\n");
- asn_DEF_PDU.free_struct(&asn_DEF_PDU, st, 0);
+ ASN_STRUCT_FREE(asn_DEF_PDU, st);
st = 0; /* ignore leak for now */
}
}
@@ -291,7 +291,7 @@
break;
}
- asn_DEF_PDU.free_struct(&asn_DEF_PDU, st, 0);
+ ASN_STRUCT_FREE(asn_DEF_PDU, st);
}
/*
diff --git a/tests/tests-c-compiler/check-src/check-126.-gen-PER.c b/tests/tests-c-compiler/check-src/check-126.-gen-PER.c
index 5b62087..9c08827 100644
--- a/tests/tests-c-compiler/check-src/check-126.-gen-PER.c
+++ b/tests/tests-c-compiler/check-src/check-126.-gen-PER.c
@@ -110,7 +110,7 @@
" chunks %zd\n",
size, fname, how==AS_PER?"PER":"XER", csize);
- if(st) asn_DEF_PDU.free_struct(&asn_DEF_PDU, st, 0);
+ if(st) ASN_STRUCT_FREE(asn_DEF_PDU, st);
st = 0;
do {
@@ -308,7 +308,7 @@
else
assert(xer_encoding_equal((char *)fbuf, size, (char *)buf, buf_offset));
- asn_DEF_PDU.free_struct(&asn_DEF_PDU, st, 0);
+ ASN_STRUCT_FREE(asn_DEF_PDU, st);
}
/*
diff --git a/tests/tests-c-compiler/check-src/check-25.-fwide-types.c b/tests/tests-c-compiler/check-src/check-25.-fwide-types.c
index 5564445..090c652 100644
--- a/tests/tests-c-compiler/check-src/check-25.-fwide-types.c
+++ b/tests/tests-c-compiler/check-src/check-25.-fwide-types.c
@@ -136,7 +136,7 @@
assert(rval.consumed <= consumed);
}
- asn_DEF_T.free_struct(&asn_DEF_T, &t, 1);
+ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_T, &t);
}
static void
@@ -237,7 +237,7 @@
assert(rval.code == RC_OK);
assert(rval.consumed == size3);
- asn_DEF_T.free_struct(&asn_DEF_T, &t, 1);
+ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_T, &t);
}
}
}
diff --git a/tests/tests-c-compiler/check-src/check-31.-fwide-types.c b/tests/tests-c-compiler/check-src/check-31.-fwide-types.c
index 2777d0b..55ccbc0 100644
--- a/tests/tests-c-compiler/check-src/check-31.-fwide-types.c
+++ b/tests/tests-c-compiler/check-src/check-31.-fwide-types.c
@@ -138,7 +138,7 @@
asn_fprint(stderr, &asn_DEF_Forest, &t);
xer_fprint(stderr, &asn_DEF_Forest, &t);
- asn_DEF_Forest.free_struct(&asn_DEF_Forest, &t, 1);
+ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_Forest, &t);
}
static char xer_buf[512];
diff --git a/tests/tests-c-compiler/check-src/check-35.c b/tests/tests-c-compiler/check-src/check-35.c
index 23ed327..0c20adf 100644
--- a/tests/tests-c-compiler/check-src/check-35.c
+++ b/tests/tests-c-compiler/check-src/check-35.c
@@ -265,7 +265,7 @@
assert(rval.code == RC_OK);
assert(rval.consumed == size3);
- asn_DEF_T.free_struct(&asn_DEF_T, &t, 1);
+ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_T, &t);
}
}
}
@@ -315,12 +315,12 @@
check(&t, buf1, sizeof(buf1) + 10, sizeof(buf1));
compare(&t, buf1_reconstr, sizeof(buf1_reconstr));
- asn_DEF_T.free_struct(&asn_DEF_T, &t, 1);
+ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_T, &t);
check_xer(buf1, sizeof(buf1), "<T><c><false/></c><b><b2>z</b2></b><a>=<&></a><d><r-oid>85.79</r-oid></d></T>");
check(&t, buf2, sizeof(buf2) + 10, sizeof(buf2));
compare(&t, buf2_reconstr, sizeof(buf2_reconstr));
- asn_DEF_T.free_struct(&asn_DEF_T, &t, 1);
+ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_T, &t);
check_xer(buf2, sizeof(buf2), "<T><c><true/></c><b><b1>z</b1></b><a>=<&></a><d><oid>2.1</oid></d></T>");
/* Split the buffer in parts and check decoder restartability */
diff --git a/tests/tests-c-compiler/check-src/check-41.-fwide-types.c b/tests/tests-c-compiler/check-src/check-41.-fwide-types.c
index 4dca1e6..bc4efa3 100644
--- a/tests/tests-c-compiler/check-src/check-41.-fwide-types.c
+++ b/tests/tests-c-compiler/check-src/check-41.-fwide-types.c
@@ -281,7 +281,7 @@
assert(rval.code == RC_OK);
assert(rval.consumed == size3);
- asn_DEF_T.free_struct(&asn_DEF_T, &t, 1);
+ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_T, &t);
}
}
}
@@ -293,27 +293,27 @@
/* Check exact buf0 */
check(&t, buf0, sizeof(buf0), sizeof(buf0));
compare(&t, buf0_reconstr, sizeof(buf0_reconstr));
- asn_DEF_T.free_struct(&asn_DEF_T, &t, 1);
+ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_T, &t);
/* Check exact buf1 */
check(&t, buf1, sizeof(buf1), sizeof(buf1));
compare(&t, buf1_reconstr, sizeof(buf1_reconstr));
- asn_DEF_T.free_struct(&asn_DEF_T, &t, 1);
+ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_T, &t);
/* Check slightly more than buf1 */
check(&t, buf1, sizeof(buf1) + 10, sizeof(buf1));
compare(&t, buf1_reconstr, sizeof(buf1_reconstr));
- asn_DEF_T.free_struct(&asn_DEF_T, &t, 1);
+ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_T, &t);
/* Check exact buf2 */
check(&t, buf2, sizeof(buf2), sizeof(buf2));
compare(&t, buf2_reconstr, sizeof(buf2_reconstr));
- asn_DEF_T.free_struct(&asn_DEF_T, &t, 1);
+ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_T, &t);
/* Check slightly more than buf2 */
check(&t, buf2, sizeof(buf2) + 10, sizeof(buf2));
compare(&t, buf2_reconstr, sizeof(buf2_reconstr));
- asn_DEF_T.free_struct(&asn_DEF_T, &t, 1);
+ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_T, &t);
/* Split the buffer in parts and check decoder restartability */
partial_read(buf0, sizeof(buf0));
diff --git a/tests/tests-c-compiler/check-src/check-41.c b/tests/tests-c-compiler/check-src/check-41.c
index 1c1b907..c1efbd2 100644
--- a/tests/tests-c-compiler/check-src/check-41.c
+++ b/tests/tests-c-compiler/check-src/check-41.c
@@ -188,7 +188,7 @@
assert(rval.code == RC_OK);
assert(rval.consumed == size3);
- asn_DEF_T.free_struct(&asn_DEF_T, &t, 1);
+ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_T, &t);
}
}
}
@@ -204,13 +204,13 @@
check(&t, buf1, sizeof(buf1), sizeof(buf1));
compare(&t, buf1_reconstr, sizeof(buf1_reconstr));
asn_fprint(stderr, &asn_DEF_T, &t);
- asn_DEF_T.free_struct(&asn_DEF_T, &t, 1);
+ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_T, &t);
/* Check slightly more than buf1 */
check(&t, buf1, sizeof(buf1) + 10, sizeof(buf1));
compare(&t, buf1_reconstr, sizeof(buf1_reconstr));
asn_fprint(stderr, &asn_DEF_T, &t);
- asn_DEF_T.free_struct(&asn_DEF_T, &t, 1);
+ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_T, &t);
/* Split the buffer in parts and check decoder restartability */
partial_read(buf1, sizeof(buf1));
diff --git a/tests/tests-c-compiler/check-src/check-42.c b/tests/tests-c-compiler/check-src/check-42.c
index db4ccb7..174f1c2 100644
--- a/tests/tests-c-compiler/check-src/check-42.c
+++ b/tests/tests-c-compiler/check-src/check-42.c
@@ -66,7 +66,7 @@
assert(rval.code == RC_OK);
assert(rval.consumed == consumed);
asn_fprint(stderr, &asn_DEF_LogLine, tp);
- asn_DEF_LogLine.free_struct(&asn_DEF_LogLine, tp, 1);
+ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_LogLine, tp);
}
uint8_t *buf;
diff --git a/tests/tests-c-compiler/check-src/check-62.c b/tests/tests-c-compiler/check-src/check-62.c
index 7c1864b..560929c 100644
--- a/tests/tests-c-compiler/check-src/check-62.c
+++ b/tests/tests-c-compiler/check-src/check-62.c
@@ -78,7 +78,7 @@
int fbuf_left = size;
int fbuf_chunk = csize;
- if(st) asn_DEF_T.free_struct(&asn_DEF_T, st, 0);
+ if(st) ASN_STRUCT_FREE(asn_DEF_T, st);
st = 0;
do {
@@ -102,7 +102,7 @@
} else {
assert(rval.code != RC_OK);
fprintf(stderr, "Failed, but this was expected\n");
- asn_DEF_T.free_struct(&asn_DEF_T, st, 0);
+ ASN_STRUCT_FREE(asn_DEF_T, st);
st = 0; /* ignore leak for now */
}
}
@@ -142,7 +142,7 @@
break;
}
- asn_DEF_T.free_struct(&asn_DEF_T, st, 0);
+ ASN_STRUCT_FREE(asn_DEF_T, st);
}
/*
diff --git a/tests/tests-c-compiler/check-src/check-70.-fwide-types.c b/tests/tests-c-compiler/check-src/check-70.-fwide-types.c
index bd96978..377663c 100644
--- a/tests/tests-c-compiler/check-src/check-70.-fwide-types.c
+++ b/tests/tests-c-compiler/check-src/check-70.-fwide-types.c
@@ -121,7 +121,7 @@
fprintf(stderr, "LOADING OBJECT OF SIZE %zd, chunks %zd\n",
size, csize);
- if(st) asn_DEF_PDU.free_struct(&asn_DEF_PDU, st, 0);
+ if(st) ASN_STRUCT_FREE(asn_DEF_PDU, st);
st = 0;
do {
@@ -165,7 +165,7 @@
} else {
assert(rval.code != RC_OK);
fprintf(stderr, "Failed, but this was expected\n");
- asn_DEF_PDU.free_struct(&asn_DEF_PDU, st, 0);
+ ASN_STRUCT_FREE(asn_DEF_PDU, st);
st = 0; /* ignore leak for now */
}
}
@@ -252,7 +252,7 @@
break;
}
- asn_DEF_PDU.free_struct(&asn_DEF_PDU, st, 0);
+ ASN_STRUCT_FREE(asn_DEF_PDU, st);
}
/*
diff --git a/tests/tests-c-compiler/check-src/check-70.c b/tests/tests-c-compiler/check-src/check-70.c
index d844f08..6c10f09 100644
--- a/tests/tests-c-compiler/check-src/check-70.c
+++ b/tests/tests-c-compiler/check-src/check-70.c
@@ -110,7 +110,7 @@
fprintf(stderr, "LOADING OBJECT OF SIZE %zd, chunks %zd\n",
size, csize);
- if(st) asn_DEF_PDU.free_struct(&asn_DEF_PDU, st, 0);
+ if(st) ASN_STRUCT_FREE(asn_DEF_PDU, st);
st = 0;
do {
@@ -154,7 +154,7 @@
} else {
assert(rval.code != RC_OK);
fprintf(stderr, "Failed, but this was expected\n");
- asn_DEF_PDU.free_struct(&asn_DEF_PDU, st, 0);
+ ASN_STRUCT_FREE(asn_DEF_PDU, st);
st = 0; /* ignore leak for now */
}
}
@@ -228,7 +228,7 @@
break;
}
- asn_DEF_PDU.free_struct(&asn_DEF_PDU, st, 0);
+ ASN_STRUCT_FREE(asn_DEF_PDU, st);
}
/*