diff options
52 files changed, 192 insertions, 342 deletions
diff --git a/skeletons/OCTET_STRING.c b/skeletons/OCTET_STRING.c index f2eec13a..44ed4190 100644 --- a/skeletons/OCTET_STRING.c +++ b/skeletons/OCTET_STRING.c @@ -195,7 +195,7 @@ OCTET_STRING_decode_ber(asn_codec_ctx_t *opt_codec_ctx, } /* Restore parsing context */ - ctx = (asn_struct_ctx_t *)((char *)st + specs->ctx_offset); + ctx = (asn_struct_ctx_t *)((void *)st + specs->ctx_offset); switch(ctx->phase) { case 0: @@ -1143,7 +1143,7 @@ OCTET_STRING__decode_xer(asn_codec_ctx_t *opt_codec_ctx, } /* Restore parsing context */ - ctx = (asn_struct_ctx_t *)(((char *)*sptr) + specs->ctx_offset); + ctx = (asn_struct_ctx_t *)(((void *)*sptr) + specs->ctx_offset); return xer_decode_general(opt_codec_ctx, ctx, *sptr, xml_tag, buf_ptr, size, opt_unexpected_tag_decoder, body_receiver); @@ -1716,7 +1716,7 @@ OCTET_STRING_free(asn_TYPE_descriptor_t *td, void *sptr, int contents_only) { ? (asn_OCTET_STRING_specifics_t *)td->specifics : &asn_DEF_OCTET_STRING_specs; asn_struct_ctx_t *ctx = (asn_struct_ctx_t *) - ((char *)st + specs->ctx_offset); + ((void *)st + specs->ctx_offset); struct _stack *stck; if(!td || !st) diff --git a/skeletons/constr_CHOICE.c b/skeletons/constr_CHOICE.c index 2be69ab0..73a51473 100644 --- a/skeletons/constr_CHOICE.c +++ b/skeletons/constr_CHOICE.c @@ -34,7 +34,7 @@ #undef ADVANCE #define ADVANCE(num_bytes) do { \ size_t num = num_bytes; \ - ptr = ((const char *)ptr) + num;\ + ptr = ((const void *)ptr) + num;\ size -= num; \ if(ctx->left >= 0) \ ctx->left -= num; \ @@ -133,7 +133,7 @@ CHOICE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, /* * Restore parsing context. */ - ctx = (asn_struct_ctx_t *)((char *)st + specs->ctx_offset); + ctx = (asn_struct_ctx_t *)((void *)st + specs->ctx_offset); /* * Start to parse where left previously @@ -211,7 +211,7 @@ CHOICE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, skip = ber_skip_length(opt_codec_ctx, BER_TLV_CONSTRUCTED(ptr), - (const char *)ptr + tag_len, + (const void *)ptr + tag_len, LEFT - tag_len); switch(skip) { @@ -244,7 +244,7 @@ CHOICE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, */ if(elm->flags & ATF_POINTER) { /* Member is a pointer to another structure */ - memb_ptr2 = (void **)((char *)st + elm->memb_offset); + memb_ptr2 = (void **)((void *)st + elm->memb_offset); } else { /* * A pointer to a pointer @@ -390,7 +390,7 @@ CHOICE_encode_der(asn_TYPE_descriptor_t *td, void *sptr, */ elm = &td->elements[present-1]; if(elm->flags & ATF_POINTER) { - memb_ptr = *(void **)((char *)sptr + elm->memb_offset); + memb_ptr = *(void **)((void *)sptr + elm->memb_offset); if(memb_ptr == 0) { if(elm->optional) { erval.encoded = 0; @@ -400,7 +400,7 @@ CHOICE_encode_der(asn_TYPE_descriptor_t *td, void *sptr, _ASN_ENCODE_FAILED; } } else { - memb_ptr = (void *)((char *)sptr + elm->memb_offset); + memb_ptr = (void *)((void *)sptr + elm->memb_offset); } /* @@ -463,10 +463,10 @@ CHOICE_outmost_tag(asn_TYPE_descriptor_t *td, const void *ptr, int tag_mode, ber if(elm->flags & ATF_POINTER) { memb_ptr = *(const void * const *) - ((const char *)ptr + elm->memb_offset); + ((const void *)ptr + elm->memb_offset); } else { memb_ptr = (const void *) - ((const char *)ptr + elm->memb_offset); + ((const void *)ptr + elm->memb_offset); } return asn_TYPE_outmost_tag(elm->type, memb_ptr, @@ -498,7 +498,7 @@ CHOICE_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const void *memb_ptr; if(elm->flags & ATF_POINTER) { - memb_ptr = *(const void * const *)((const char *)sptr + elm->memb_offset); + memb_ptr = *(const void * const *)((const void *)sptr + elm->memb_offset); if(!memb_ptr) { if(elm->optional) return 0; @@ -508,7 +508,7 @@ CHOICE_constraint(asn_TYPE_descriptor_t *td, const void *sptr, return -1; } } else { - memb_ptr = (const void *)((const char *)sptr + elm->memb_offset); + memb_ptr = (const void *)((const void *)sptr + elm->memb_offset); } if(elm->memb_constraints) { @@ -535,7 +535,7 @@ CHOICE_constraint(asn_TYPE_descriptor_t *td, const void *sptr, #undef XER_ADVANCE #define XER_ADVANCE(num_bytes) do { \ size_t num = num_bytes; \ - buf_ptr = ((const char *)buf_ptr) + num;\ + buf_ptr = ((const void *)buf_ptr) + num;\ size -= num; \ consumed_myself += num; \ } while(0) @@ -574,7 +574,7 @@ CHOICE_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, /* * Restore parsing context. */ - ctx = (asn_struct_ctx_t *)((char *)st + specs->ctx_offset); + ctx = (asn_struct_ctx_t *)((void *)st + specs->ctx_offset); if(ctx->phase == 0 && !*xml_tag) ctx->phase = 1; /* Skip the outer tag checking phase */ @@ -605,7 +605,7 @@ CHOICE_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, if(elm->flags & ATF_POINTER) { /* Member is a pointer to another structure */ - memb_ptr2 = (void **)((char *)st + memb_ptr2 = (void **)((void *)st + elm->memb_offset); } else { memb_ptr = (char *)st + elm->memb_offset; @@ -797,10 +797,10 @@ CHOICE_encode_xer(asn_TYPE_descriptor_t *td, void *sptr, unsigned int mlen = strlen(mname); if(elm->flags & ATF_POINTER) { - memb_ptr = *(void **)((char *)sptr + elm->memb_offset); + memb_ptr = *(void **)((void *)sptr + elm->memb_offset); if(!memb_ptr) _ASN_ENCODE_FAILED; } else { - memb_ptr = (void *)((char *)sptr + elm->memb_offset); + memb_ptr = (void *)((void *)sptr + elm->memb_offset); } er.encoded = 0; @@ -884,7 +884,7 @@ CHOICE_decode_uper(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, elm = &td->elements[value]; if(elm->flags & ATF_POINTER) { /* Member is a pointer to another structure */ - memb_ptr2 = (void **)((char *)st + elm->memb_offset); + memb_ptr2 = (void **)((void *)st + elm->memb_offset); } else { memb_ptr = (char *)st + elm->memb_offset; memb_ptr2 = &memb_ptr; @@ -962,7 +962,7 @@ CHOICE_encode_uper(asn_TYPE_descriptor_t *td, elm = &td->elements[present]; if(elm->flags & ATF_POINTER) { /* Member is a pointer to another structure */ - memb_ptr = *(void **)((char *)sptr + elm->memb_offset); + memb_ptr = *(void **)((void *)sptr + elm->memb_offset); if(!memb_ptr) _ASN_ENCODE_FAILED; } else { memb_ptr = (char *)sptr + elm->memb_offset; @@ -1010,10 +1010,10 @@ CHOICE_print(asn_TYPE_descriptor_t *td, const void *sptr, int ilevel, const void *memb_ptr; if(elm->flags & ATF_POINTER) { - memb_ptr = *(const void * const *)((const char *)sptr + elm->memb_offset); + memb_ptr = *(const void * const *)((const void *)sptr + elm->memb_offset); if(!memb_ptr) return (cb("<absent>", 8, app_key) < 0) ? -1 : 0; } else { - memb_ptr = (const void *)((const char *)sptr + elm->memb_offset); + memb_ptr = (const void *)((const void *)sptr + elm->memb_offset); } /* Print member's name and stuff */ @@ -1053,11 +1053,11 @@ CHOICE_free(asn_TYPE_descriptor_t *td, void *ptr, int contents_only) { void *memb_ptr; if(elm->flags & ATF_POINTER) { - memb_ptr = *(void **)((char *)ptr + elm->memb_offset); + memb_ptr = *(void **)((void *)ptr + elm->memb_offset); if(memb_ptr) ASN_STRUCT_FREE(*elm->type, memb_ptr); } else { - memb_ptr = (void *)((char *)ptr + elm->memb_offset); + memb_ptr = (void *)((void *)ptr + elm->memb_offset); ASN_STRUCT_FREE_CONTENTS_ONLY(*elm->type, memb_ptr); } } @@ -1082,7 +1082,7 @@ _fetch_present_idx(const void *struct_ptr, int pres_offset, int pres_size) { const void *present_ptr; int present; - present_ptr = ((const char *)struct_ptr) + pres_offset; + present_ptr = ((const void *)struct_ptr) + pres_offset; switch(pres_size) { case sizeof(int): present = *(const int *)present_ptr; break; @@ -1100,7 +1100,7 @@ _fetch_present_idx(const void *struct_ptr, int pres_offset, int pres_size) { static void _set_present_idx(void *struct_ptr, int pres_offset, int pres_size, int present) { void *present_ptr; - present_ptr = ((char *)struct_ptr) + pres_offset; + present_ptr = ((void *)struct_ptr) + pres_offset; switch(pres_size) { case sizeof(int): *(int *)present_ptr = present; break; diff --git a/skeletons/constr_SEQUENCE.c b/skeletons/constr_SEQUENCE.c index bc7f4ad3..34c59212 100644 --- a/skeletons/constr_SEQUENCE.c +++ b/skeletons/constr_SEQUENCE.c @@ -34,7 +34,7 @@ #undef ADVANCE #define ADVANCE(num_bytes) do { \ size_t num = num_bytes; \ - ptr = ((const char *)ptr) + num;\ + ptr = ((const void *)ptr) + num;\ size -= num; \ if(ctx->left >= 0) \ ctx->left -= num; \ @@ -144,7 +144,7 @@ SEQUENCE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, /* * Restore parsing context. */ - ctx = (asn_struct_ctx_t *)((char *)st + specs->ctx_offset); + ctx = (asn_struct_ctx_t *)((void *)st + specs->ctx_offset); /* * Start to parse where left previously @@ -366,7 +366,7 @@ SEQUENCE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, ber_tlv_tag_string(tlv_tag), edx); skip = ber_skip_length(opt_codec_ctx, BER_TLV_CONSTRUCTED(ptr), - (const char *)ptr + tag_len, + (const void *)ptr + tag_len, LEFT - tag_len); ASN_DEBUG("Skip length %d in %s", (int)skip, td->name); @@ -397,13 +397,13 @@ SEQUENCE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, */ if(elements[edx].flags & ATF_POINTER) { /* Member is a pointer to another structure */ - memb_ptr2 = (void **)((char *)st + elements[edx].memb_offset); + memb_ptr2 = (void **)((void *)st + elements[edx].memb_offset); } else { /* * A pointer to a pointer * holding the start of the structure */ - memb_ptr = (char *)st + elements[edx].memb_offset; + memb_ptr = (void *)st + elements[edx].memb_offset; memb_ptr2 = &memb_ptr; } /* @@ -489,7 +489,7 @@ SEQUENCE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, ll = ber_skip_length(opt_codec_ctx, BER_TLV_CONSTRUCTED(ptr), - (const char *)ptr + tl, LEFT - tl); + (const void *)ptr + tl, LEFT - tl); switch(ll) { case 0: if(!SIZE_VIOLATION) RETURN(RC_WMORE); /* Fall through */ @@ -528,14 +528,14 @@ SEQUENCE_encode_der(asn_TYPE_descriptor_t *td, asn_TYPE_member_t *elm = &td->elements[edx]; void *memb_ptr; if(elm->flags & ATF_POINTER) { - memb_ptr = *(void **)((char *)sptr + elm->memb_offset); + memb_ptr = *(void **)((void *)sptr + elm->memb_offset); if(!memb_ptr) { if(elm->optional) continue; /* Mandatory element is missing */ _ASN_ENCODE_FAILED; } } else { - memb_ptr = (void *)((char *)sptr + elm->memb_offset); + memb_ptr = (void *)((void *)sptr + elm->memb_offset); } erval = elm->type->der_encoder(elm->type, memb_ptr, elm->tag_mode, elm->tag, @@ -567,10 +567,10 @@ SEQUENCE_encode_der(asn_TYPE_descriptor_t *td, void *memb_ptr; if(elm->flags & ATF_POINTER) { - memb_ptr = *(void **)((char *)sptr + elm->memb_offset); + memb_ptr = *(void **)((void *)sptr + elm->memb_offset); if(!memb_ptr) continue; } else { - memb_ptr = (void *)((char *)sptr + elm->memb_offset); + memb_ptr = (void *)((void *)sptr + elm->memb_offset); } tmperval = elm->type->der_encoder(elm->type, memb_ptr, elm->tag_mode, elm->tag, @@ -595,7 +595,7 @@ SEQUENCE_encode_der(asn_TYPE_descriptor_t *td, #undef XER_ADVANCE #define XER_ADVANCE(num_bytes) do { \ size_t num = num_bytes; \ - buf_ptr = ((const char *)buf_ptr) + num;\ + buf_ptr = ((const void *)buf_ptr) + num;\ size -= num; \ consumed_myself += num; \ } while(0) @@ -637,7 +637,7 @@ SEQUENCE_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, /* * Restore parsing context. */ - ctx = (asn_struct_ctx_t *)((char *)st + specs->ctx_offset); + ctx = (asn_struct_ctx_t *)((void *)st + specs->ctx_offset); /* @@ -667,10 +667,9 @@ SEQUENCE_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, if(elm->flags & ATF_POINTER) { /* Member is a pointer to another structure */ - memb_ptr2 = (void **)((char *)st - + elm->memb_offset); + memb_ptr2 = (void **)((void *)st + elm->memb_offset); } else { - memb_ptr = (char *)st + elm->memb_offset; + memb_ptr = (void *)st + elm->memb_offset; memb_ptr2 = &memb_ptr; } @@ -870,7 +869,7 @@ SEQUENCE_encode_xer(asn_TYPE_descriptor_t *td, void *sptr, unsigned int mlen = strlen(mname); if(elm->flags & ATF_POINTER) { - memb_ptr = *(void **)((char *)sptr + elm->memb_offset); + memb_ptr = *(void **)((void *)sptr + elm->memb_offset); if(!memb_ptr) { if(elm->optional) continue; @@ -878,7 +877,7 @@ SEQUENCE_encode_xer(asn_TYPE_descriptor_t *td, void *sptr, _ASN_ENCODE_FAILED; } } else { - memb_ptr = (void *)((char *)sptr + elm->memb_offset); + memb_ptr = (void *)((void *)sptr + elm->memb_offset); } if(!xcan) _i_ASN_TEXT_INDENT(1, ilevel); @@ -918,14 +917,14 @@ SEQUENCE_print(asn_TYPE_descriptor_t *td, const void *sptr, int ilevel, const void *memb_ptr; if(elm->flags & ATF_POINTER) { - memb_ptr = *(const void * const *)((const char *)sptr + elm->memb_offset); + memb_ptr = *(const void * const *)((const void *)sptr + elm->memb_offset); if(!memb_ptr) { if(elm->optional) continue; /* Print <absent> line */ /* Fall through */ } } else { - memb_ptr = (const void *)((const char *)sptr + elm->memb_offset); + memb_ptr = (const void *)((const void *)sptr + elm->memb_offset); } /* Indentation */ @@ -961,11 +960,11 @@ SEQUENCE_free(asn_TYPE_descriptor_t *td, void *sptr, int contents_only) { asn_TYPE_member_t *elm = &td->elements[edx]; void *memb_ptr; if(elm->flags & ATF_POINTER) { - memb_ptr = *(void **)((char *)sptr + elm->memb_offset); + memb_ptr = *(void **)((void *)sptr + elm->memb_offset); if(memb_ptr) ASN_STRUCT_FREE(*elm->type, memb_ptr); } else { - memb_ptr = (void *)((char *)sptr + elm->memb_offset); + memb_ptr = (void *)((void *)sptr + elm->memb_offset); ASN_STRUCT_FREE_CONTENTS_ONLY(*elm->type, memb_ptr); } } @@ -995,7 +994,7 @@ SEQUENCE_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const void *memb_ptr; if(elm->flags & ATF_POINTER) { - memb_ptr = *(const void * const *)((const char *)sptr + elm->memb_offset); + memb_ptr = *(const void * const *)((const void *)sptr + elm->memb_offset); if(!memb_ptr) { if(elm->optional) continue; @@ -1005,7 +1004,7 @@ SEQUENCE_constraint(asn_TYPE_descriptor_t *td, const void *sptr, return -1; } } else { - memb_ptr = (const void *)((const char *)sptr + elm->memb_offset); + memb_ptr = (const void *)((const void *)sptr + elm->memb_offset); } if(elm->memb_constraints) { @@ -1089,9 +1088,9 @@ SEQUENCE_decode_uper(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, /* Fetch the pointer to this member */ if(elm->flags & ATF_POINTER) { - memb_ptr2 = (void **)((char *)st + elm->memb_offset); + memb_ptr2 = (void **)((void *)st + elm->memb_offset); } else { - memb_ptr = (char *)st + elm->memb_offset; + memb_ptr = (void *)st + elm->memb_offset; memb_ptr2 = &memb_ptr; } @@ -1172,9 +1171,9 @@ SEQUENCE_decode_uper(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, /* Fetch the pointer to this member */ if(elm->flags & ATF_POINTER) { - memb_ptr2 = (void **)((char *)st + elm->memb_offset); + memb_ptr2 = (void **)((void *)st + elm->memb_offset); } else { - memb_ptr = (void *)((char *)st + elm->memb_offset); + memb_ptr = (void *)((void *)st + elm->memb_offset); memb_ptr2 = &memb_ptr; } @@ -1222,7 +1221,7 @@ SEQUENCE_decode_uper(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, /* Fetch the pointer to this member */ if(elm->flags & ATF_POINTER) { - memb_ptr2 = (void **)((char *)st + memb_ptr2 = (void **)((void *)st + elm->memb_offset); if(*memb_ptr2) continue; } else { @@ -1266,10 +1265,10 @@ SEQUENCE_handle_extensions(asn_TYPE_descriptor_t *td, void *sptr, /* Fetch the pointer to this member */ if(elm->flags & ATF_POINTER) { - memb_ptr2 = (void **)((char *)sptr + elm->memb_offset); + memb_ptr2 = (void **)((void *)sptr + elm->memb_offset); present = (*memb_ptr2 != 0); } else { - memb_ptr = (void *)((char *)sptr + elm->memb_offset); + memb_ptr = (void *)((void *)sptr + elm->memb_offset); memb_ptr2 = &memb_ptr; present = 1; } @@ -1335,10 +1334,10 @@ SEQUENCE_encode_uper(asn_TYPE_descriptor_t *td, /* Fetch the pointer to this member */ if(elm->flags & ATF_POINTER) { - memb_ptr2 = (void **)((char *)sptr + elm->memb_offset); + memb_ptr2 = (void **)((void *)sptr + elm->memb_offset); present = (*memb_ptr2 != 0); } else { - memb_ptr = (void *)((char *)sptr + elm->memb_offset); + memb_ptr = (void *)((void *)sptr + elm->memb_offset); memb_ptr2 = &memb_ptr; present = 1; } @@ -1374,7 +1373,7 @@ SEQUENCE_encode_uper(asn_TYPE_descriptor_t *td, /* Fetch the pointer to this member */ if(elm->flags & ATF_POINTER) { - memb_ptr2 = (void **)((char *)sptr + elm->memb_offset); + memb_ptr2 = (void **)((void *)sptr + elm->memb_offset); if(!*memb_ptr2) { ASN_DEBUG("Element %s %d not present", elm->name, edx); @@ -1384,7 +1383,7 @@ SEQUENCE_encode_uper(asn_TYPE_descriptor_t *td, _ASN_ENCODE_FAILED; } } else { - memb_ptr = (void *)((char *)sptr + elm->memb_offset); + memb_ptr = (void *)((void *)sptr + elm->memb_offset); memb_ptr2 = &memb_ptr; } diff --git a/skeletons/constr_SET.c b/skeletons/constr_SET.c index ecf56617..d27a8268 100644 --- a/skeletons/constr_SET.c +++ b/skeletons/constr_SET.c @@ -36,7 +36,7 @@ static int _SET_is_populated(asn_TYPE_descriptor_t *td, void *st); #undef ADVANCE #define ADVANCE(num_bytes) do { \ size_t num = num_bytes; \ - ptr = ((const char *)ptr) + num;\ + ptr = ((const void *)ptr) + num;\ size -= num; \ if(ctx->left >= 0) \ ctx->left -= num; \ @@ -132,7 +132,7 @@ SET_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, /* * Restore parsing context. */ - ctx = (asn_struct_ctx_t *)((char *)st + specs->ctx_offset); + ctx = (asn_struct_ctx_t *)((void *)st + specs->ctx_offset); /* * Start to parse where left previously @@ -250,7 +250,7 @@ SET_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, skip = ber_skip_length(opt_codec_ctx, BER_TLV_CONSTRUCTED(ptr), - (const char *)ptr + tag_len, LEFT - tag_len); + (const void *)ptr + tag_len, LEFT - tag_len); switch(skip) { case 0: if(!SIZE_VIOLATION) RETURN(RC_WMORE); @@ -271,7 +271,7 @@ SET_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, * Check for duplications: must not overwrite * already decoded elements. */ - if(ASN_SET_ISPRESENT2((char *)st + specs->pres_offset, edx)) { + if(ASN_SET_ISPRESENT2((void *)st + specs->pres_offset, edx)) { ASN_DEBUG("SET %s: Duplicate element %s (%d)", td->name, elements[edx].name, edx); RETURN(RC_FAIL); @@ -284,13 +284,13 @@ SET_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, */ if(elements[edx].flags & ATF_POINTER) { /* Member is a pointer to another structure */ - memb_ptr2 = (void **)((char *)st + elements[edx].memb_offset); + memb_ptr2 = (void **)((void *)st + elements[edx].memb_offset); } else { /* * A pointer to a pointer * holding the start of the structure */ - memb_ptr = (char *)st + elements[edx].memb_offset; + memb_ptr = (void *)st + elements[edx].memb_offset; memb_ptr2 = &memb_ptr; } /* @@ -302,7 +302,7 @@ SET_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, elements[edx].tag_mode); switch(rval.code) { case RC_OK: - ASN_SET_MKPRESENT((char *)st + specs->pres_offset, edx); + ASN_SET_MKPRESENT((void *)st + specs->pres_offset, edx); break; case RC_WMORE: /* More data expected */ if(!SIZE_VIOLATION) { @@ -369,7 +369,7 @@ SET_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, ll = ber_skip_length(opt_codec_ctx, BER_TLV_CONSTRUCTED(ptr), - (const char *)ptr + tl, LEFT - tl); + (const void *)ptr + tl, LEFT - tl); switch(ll) { case 0: if(!SIZE_VIOLATION) RETURN(RC_WMORE); /* Fall through */ @@ -404,7 +404,7 @@ _SET_is_populated(asn_TYPE_descriptor_t *td, void *st) { unsigned int midx, pres, must; midx = edx/(8 * sizeof(specs->_mandatory_elements[0])); - pres = ((unsigned int *)((char *)st+specs->pres_offset))[midx]; + pres = ((unsigned int *)((void *)st+specs->pres_offset))[midx]; must = sys_ntohl(specs->_mandatory_elements[midx]); if((pres & must) == must) { @@ -473,7 +473,7 @@ SET_encode_der(asn_TYPE_descriptor_t *td, * Compute the length of the encoding of this member. */ if(elm->flags & ATF_POINTER) { - memb_ptr = *(void **)((char *)sptr + elm->memb_offset); + memb_ptr = *(void **)((void *)sptr + elm->memb_offset); if(!memb_ptr) { if(!elm->optional) /* Mandatory elements missing */ @@ -486,7 +486,7 @@ SET_encode_der(asn_TYPE_descriptor_t *td, continue; } } else { - memb_ptr = (void *)((char *)sptr + elm->memb_offset); + memb_ptr = (void *)((void *)sptr + elm->memb_offset); } tmper = elm->type->der_encoder(elm->type, memb_ptr, elm->tag_mode, elm->tag, @@ -547,10 +547,10 @@ SET_encode_der(asn_TYPE_descriptor_t *td, elm = &td->elements[t2m[edx].el_no]; if(elm->flags & ATF_POINTER) { - memb_ptr = *(void **)((char *)sptr + elm->memb_offset); + memb_ptr = *(void **)((void *)sptr + elm->memb_offset); if(!memb_ptr) continue; } else { - memb_ptr = (void *)((char *)sptr + elm->memb_offset); + memb_ptr = (void *)((void *)sptr + elm->memb_offset); } tmper = elm->type->der_encoder(elm->type, memb_ptr, elm->tag_mode, elm->tag, @@ -573,7 +573,7 @@ SET_encode_der(asn_TYPE_descriptor_t *td, #undef XER_ADVANCE #define XER_ADVANCE(num_bytes) do { \ size_t num = num_bytes; \ - buf_ptr = ((const char *)buf_ptr) + num;\ + buf_ptr = ((const void *)buf_ptr) + num;\ size -= num; \ consumed_myself += num; \ } while(0) @@ -613,7 +613,7 @@ SET_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, /* * Restore parsing context. */ - ctx = (asn_struct_ctx_t *)((char *)st + specs->ctx_offset); + ctx = (asn_struct_ctx_t *)((void *)st + specs->ctx_offset); /* * Phases of XER/XML processing: @@ -637,7 +637,7 @@ SET_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, void *memb_ptr; /* Pointer to the member */ void **memb_ptr2; /* Pointer to that pointer */ - if(ASN_SET_ISPRESENT2((char *)st + specs->pres_offset, + if(ASN_SET_ISPRESENT2((void *)st + specs->pres_offset, edx)) { ASN_DEBUG("SET %s: Duplicate element %s (%d)", td->name, elements[edx].name, edx); @@ -648,10 +648,10 @@ SET_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, if(elm->flags & ATF_POINTER) { /* Member is a pointer to another structure */ - memb_ptr2 = (void **)((char *)st + memb_ptr2 = (void **)((void *)st + elm->memb_offset); } else { - memb_ptr = (char *)st + elm->memb_offset; + memb_ptr = (void *)st + elm->memb_offset; memb_ptr2 = &memb_ptr; } @@ -663,7 +663,7 @@ SET_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, if(tmprval.code != RC_OK) RETURN(tmprval.code); ctx->phase = 1; /* Back to body processing */ - ASN_SET_MKPRESENT((char *)st + specs->pres_offset, edx); + ASN_SET_MKPRESENT((void *)st + specs->pres_offset, edx); ASN_DEBUG("XER/SET phase => %d", ctx->phase); /* Fall through */ } @@ -827,7 +827,7 @@ SET_encode_xer(asn_TYPE_descriptor_t *td, void *sptr, mlen = strlen(elm->name); if(elm->flags & ATF_POINTER) { - memb_ptr = *(void **)((char *)sptr + elm->memb_offset); + memb_ptr = *(void **)((void *)sptr + elm->memb_offset); if(!memb_ptr) { if(elm->optional) continue; @@ -835,7 +835,7 @@ SET_encode_xer(asn_TYPE_descriptor_t *td, void *sptr, _ASN_ENCODE_FAILED; } } else { - memb_ptr = (void *)((char *)sptr + elm->memb_offset); + memb_ptr = (void *)((void *)sptr + elm->memb_offset); } if(!xcan) @@ -877,14 +877,14 @@ SET_print(asn_TYPE_descriptor_t *td, const void *sptr, int ilevel, const void *memb_ptr; if(elm->flags & ATF_POINTER) { - memb_ptr = *(const void * const *)((const char *)sptr + elm->memb_offset); + memb_ptr = *(const void * const *)((const void *)sptr + elm->memb_offset); if(!memb_ptr) { if(elm->optional) continue; /* Print <absent> line */ /* Fall through */ } } else { - memb_ptr = (const void *)((const char *)sptr + elm->memb_offset); + memb_ptr = (const void *)((const void *)sptr + elm->memb_offset); } _i_INDENT(1); @@ -919,11 +919,11 @@ SET_free(asn_TYPE_descriptor_t *td, void *ptr, int contents_only) { asn_TYPE_member_t *elm = &td->elements[edx]; void *memb_ptr; if(elm->flags & ATF_POINTER) { - memb_ptr = *(void **)((char *)ptr + elm->memb_offset); + memb_ptr = *(void **)((void *)ptr + elm->memb_offset); if(memb_ptr) ASN_STRUCT_FREE(*elm->type, memb_ptr); } else { - memb_ptr = (void *)((char *)ptr + elm->memb_offset); + memb_ptr = (void *)((void *)ptr + elm->memb_offset); ASN_STRUCT_FREE_CONTENTS_ONLY(*elm->type, memb_ptr); } } @@ -953,7 +953,7 @@ SET_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const void *memb_ptr; if(elm->flags & ATF_POINTER) { - memb_ptr = *(const void * const *)((const char *)sptr + elm->memb_offset); + memb_ptr = *(const void * const *)((const void *)sptr + elm->memb_offset); if(!memb_ptr) { if(elm->optional) continue; @@ -963,7 +963,7 @@ SET_constraint(asn_TYPE_descriptor_t *td, const void *sptr, return -1; } } else { - memb_ptr = (const void *)((const char *)sptr + elm->memb_offset); + memb_ptr = (const void *)((const void *)sptr + elm->memb_offset); } if(elm->memb_constraints) { diff --git a/skeletons/constr_SET_OF.c b/skeletons/constr_SET_OF.c index b68d7ca1..7868929e 100644 --- a/skeletons/constr_SET_OF.c +++ b/skeletons/constr_SET_OF.c @@ -34,7 +34,7 @@ #undef ADVANCE #define ADVANCE(num_bytes) do { \ size_t num = num_bytes; \ - ptr = ((const char *)ptr) + num;\ + ptr = ((const void *)ptr) + num;\ size -= num; \ if(ctx->left >= 0) \ ctx->left -= num; \ @@ -100,7 +100,7 @@ SET_OF_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, /* * Restore parsing context. */ - ctx = (asn_struct_ctx_t *)((char *)st + specs->ctx_offset); + ctx = (asn_struct_ctx_t *)((void *)st + specs->ctx_offset); /* * Start to parse where left previously @@ -457,7 +457,7 @@ SET_OF_encode_der(asn_TYPE_descriptor_t *td, void *ptr, #undef XER_ADVANCE #define XER_ADVANCE(num_bytes) do { \ size_t num = num_bytes; \ - buf_ptr = ((const char *)buf_ptr) + num;\ + buf_ptr = ((const void *)buf_ptr) + num;\ size -= num; \ consumed_myself += num; \ } while(0) @@ -505,7 +505,7 @@ SET_OF_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, /* * Restore parsing context. */ - ctx = (asn_struct_ctx_t *)((char *)st + specs->ctx_offset); + ctx = (asn_struct_ctx_t *)((void *)st + specs->ctx_offset); /* * Phases of XER/XML processing: @@ -627,7 +627,7 @@ SET_OF_encode_xer_callback(const void *buffer, size_t size, void *key) { t->buffer = p; t->size = newsize; } - memcpy((char *)t->buffer + t->offset, buffer, size); + memcpy((void *)t->buffer + t->offset, buffer, size); t->offset += size; return 0; } @@ -809,7 +809,7 @@ SET_OF_free(asn_TYPE_descriptor_t *td, void *ptr, int contents_only) { asn_set_empty(list); /* Remove (list->array) */ specs = (asn_SET_OF_specifics_t *)td->specifics; - ctx = (asn_struct_ctx_t *)((char *)ptr + specs->ctx_offset); + ctx = (asn_struct_ctx_t *)((void *)ptr + specs->ctx_offset); if(ctx->ptr) { ASN_STRUCT_FREE(*elm->type, ctx->ptr); ctx->ptr = 0; diff --git a/tests/03-enum-OK.asn1.-EF b/tests/03-enum-OK.asn1.-EF index 0abe0a8b..761736ff 100644 --- a/tests/03-enum-OK.asn1.-EF +++ b/tests/03-enum-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestEnum1 { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 3 } +ModuleTestEnum1 { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 3 } DEFINITIONS ::= BEGIN diff --git a/tests/04-enum-SE.asn1.-E b/tests/04-enum-SE.asn1.-E index 6de07628..2036bd54 100644 --- a/tests/04-enum-SE.asn1.-E +++ b/tests/04-enum-SE.asn1.-E @@ -1,8 +1,5 @@ -ModuleTestEnum2 { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 4 } +ModuleTestEnum2 { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 4 } DEFINITIONS ::= BEGIN diff --git a/tests/07-int-OK.asn1.-EF b/tests/07-int-OK.asn1.-EF index 9d9f7aa1..3baa862e 100644 --- a/tests/07-int-OK.asn1.-EF +++ b/tests/07-int-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestInt1 { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 7 } +ModuleTestInt1 { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 7 } DEFINITIONS ::= BEGIN diff --git a/tests/104-param-1-OK.asn1.-EFprint-class-matrix b/tests/104-param-1-OK.asn1.-EFprint-class-matrix index bc11953c..754ba541 100644 --- a/tests/104-param-1-OK.asn1.-EFprint-class-matrix +++ b/tests/104-param-1-OK.asn1.-EFprint-class-matrix @@ -1,8 +1,5 @@ -ModuleParameterization1 { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 104 } +ModuleParameterization1 { iso org(3) dod(6) internet(1) private(4) + enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 104 } DEFINITIONS ::= BEGIN diff --git a/tests/112-param-class-OK.asn1.-EF b/tests/112-param-class-OK.asn1.-EF index 426dcfd4..99223679 100644 --- a/tests/112-param-class-OK.asn1.-EF +++ b/tests/112-param-class-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleParameterizationClass { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 112 } +ModuleParameterizationClass { iso org(3) dod(6) internet(1) private(4) + enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 112 } DEFINITIONS ::= BEGIN diff --git a/tests/117-real-constraint-OK.asn1.-EF b/tests/117-real-constraint-OK.asn1.-EF index 7501cddd..2745e144 100644 --- a/tests/117-real-constraint-OK.asn1.-EF +++ b/tests/117-real-constraint-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleRealConstraint { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 117 } +ModuleRealConstraint { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 117 } DEFINITIONS ::= BEGIN diff --git a/tests/118-per-constraint-OK.asn1.-EFprint-constraints b/tests/118-per-constraint-OK.asn1.-EFprint-constraints Binary files differindex 4ad99ed5..4a527eff 100644 --- a/tests/118-per-constraint-OK.asn1.-EFprint-constraints +++ b/tests/118-per-constraint-OK.asn1.-EFprint-constraints diff --git a/tests/119-per-strings-OK.asn1.-EF b/tests/119-per-strings-OK.asn1.-EF index af5d8577..7819c03f 100644 --- a/tests/119-per-strings-OK.asn1.-EF +++ b/tests/119-per-strings-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModulePERStrings { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 119 } +ModulePERStrings { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 119 } DEFINITIONS AUTOMATIC TAGS ::= BEGIN diff --git a/tests/121-empty-imports-OK.asn1.-EF b/tests/121-empty-imports-OK.asn1.-EF index 862652f0..a5ad6816 100644 --- a/tests/121-empty-imports-OK.asn1.-EF +++ b/tests/121-empty-imports-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleEmptyIMPORTS { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 121 } +ModuleEmptyIMPORTS { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 121 } DEFINITIONS AUTOMATIC TAGS ::= BEGIN diff --git a/tests/123-valueassignment-OK.asn1.-EF b/tests/123-valueassignment-OK.asn1.-EF index 9ea5eea4..8fe6f2c4 100644 --- a/tests/123-valueassignment-OK.asn1.-EF +++ b/tests/123-valueassignment-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleValueAssignmentConstrained { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 123 } +ModuleValueAssignmentConstrained { iso org(3) dod(6) internet(1) private(4) + enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 123 } DEFINITIONS AUTOMATIC TAGS ::= BEGIN diff --git a/tests/124-multiconstraint-OK.asn1.-EF b/tests/124-multiconstraint-OK.asn1.-EF index 6bf828d9..efd3214b 100644 --- a/tests/124-multiconstraint-OK.asn1.-EF +++ b/tests/124-multiconstraint-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleMultiConstraint { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 124 } +ModuleMultiConstraint { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 124 } DEFINITIONS AUTOMATIC TAGS ::= BEGIN diff --git a/tests/125-bitstring-constraint-OK.asn1.-EF b/tests/125-bitstring-constraint-OK.asn1.-EF index 46efa88e..0887560f 100644 --- a/tests/125-bitstring-constraint-OK.asn1.-EF +++ b/tests/125-bitstring-constraint-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleBitStringConstraint { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 125 } +ModuleBitStringConstraint { iso org(3) dod(6) internet(1) private(4) + enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 125 } DEFINITIONS ::= BEGIN diff --git a/tests/125-bitstring-constraint-OK.asn1.-X b/tests/125-bitstring-constraint-OK.asn1.-X index 3984d276..2cccb90b 100644 --- a/tests/125-bitstring-constraint-OK.asn1.-X +++ b/tests/125-bitstring-constraint-OK.asn1.-X @@ -1,11 +1,8 @@ <!-- XML DTD generated by asn1c-0.9.24 --> <!-- ASN.1 module -ModuleBitStringConstraint { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 125 } +ModuleBitStringConstraint { iso org(3) dod(6) internet(1) private(4) + enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 125 } found in ../tests/125-bitstring-constraint-OK.asn1 --> <!ELEMENT T (flag1?, flag2?, flag3?)> diff --git a/tests/129-enum-OK.asn1.-EF b/tests/129-enum-OK.asn1.-EF index 1d9b268c..ebc3d30e 100644 --- a/tests/129-enum-OK.asn1.-EF +++ b/tests/129-enum-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestEnum1 { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 129 } +ModuleTestEnum1 { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 129 } DEFINITIONS ::= BEGIN diff --git a/tests/130-enum-OK.asn1.-EF b/tests/130-enum-OK.asn1.-EF index f510ae58..eaa5a51a 100644 --- a/tests/130-enum-OK.asn1.-EF +++ b/tests/130-enum-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestEnum1 { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 130 } +ModuleTestEnum1 { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 130 } DEFINITIONS ::= BEGIN diff --git a/tests/14-resolver-OK.asn1.-EF b/tests/14-resolver-OK.asn1.-EF index 0e0d7fa4..8c3eb0fa 100644 --- a/tests/14-resolver-OK.asn1.-EF +++ b/tests/14-resolver-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestResolver2 { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 14 1 } +ModuleTestResolver2 { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 14 1 } DEFINITIONS ::= BEGIN @@ -21,11 +18,8 @@ check-other INTEGER ::= 1 END -ModuleTestResolver3 { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 14 2 } +ModuleTestResolver3 { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 14 2 } DEFINITIONS ::= BEGIN @@ -38,11 +32,8 @@ Enumeration ::= ENUMERATED { END -HiddenModule { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 14 3 } +HiddenModule { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 14 3 } DEFINITIONS ::= BEGIN diff --git a/tests/16-constraint-OK.asn1.-EF b/tests/16-constraint-OK.asn1.-EF index 54441201..a1f8e851 100644 --- a/tests/16-constraint-OK.asn1.-EF +++ b/tests/16-constraint-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestConstraint1 { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 16 1 } +ModuleTestConstraint1 { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 16 1 } DEFINITIONS ::= BEGIN @@ -12,11 +9,8 @@ Type6 ::= IA5String ((SIZE(1..10))(FROM("a".."z" | "#"))) END -ModuleTestConstraint2 { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 16 2 } +ModuleTestConstraint2 { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 16 2 } DEFINITIONS ::= BEGIN diff --git a/tests/16-constraint-OK.asn1.-EFprint-constraints b/tests/16-constraint-OK.asn1.-EFprint-constraints Binary files differindex 947c8c78..67fe1bd0 100644 --- a/tests/16-constraint-OK.asn1.-EFprint-constraints +++ b/tests/16-constraint-OK.asn1.-EFprint-constraints diff --git a/tests/19-param-OK.asn1.-EF b/tests/19-param-OK.asn1.-EF index fe0b63a1..da640152 100644 --- a/tests/19-param-OK.asn1.-EF +++ b/tests/19-param-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestParam { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 19 } +ModuleTestParam { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 19 } DEFINITIONS ::= BEGIN diff --git a/tests/20-constr-OK.asn1.-EF b/tests/20-constr-OK.asn1.-EF index fbc4cc00..798f756e 100644 --- a/tests/20-constr-OK.asn1.-EF +++ b/tests/20-constr-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestConstr { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 20 } +ModuleTestConstr { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 20 } DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN diff --git a/tests/21-tags-OK.asn1.-EF b/tests/21-tags-OK.asn1.-EF index 955d5520..566e6a1e 100644 --- a/tests/21-tags-OK.asn1.-EF +++ b/tests/21-tags-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestTags1 { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 21 1 } +ModuleTestTags1 { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 21 1 } DEFINITIONS EXPLICIT TAGS ::= BEGIN @@ -13,11 +10,8 @@ T1 ::= CHOICE { END -ModuleTestTags2 { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 21 2 } +ModuleTestTags2 { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 21 2 } DEFINITIONS IMPLICIT TAGS ::= BEGIN diff --git a/tests/22-tags-OK.asn1.-EF b/tests/22-tags-OK.asn1.-EF index 0b13dc5d..b1a0b8c4 100644 --- a/tests/22-tags-OK.asn1.-EF +++ b/tests/22-tags-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestTags3 { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 22 } +ModuleTestTags3 { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 22 } DEFINITIONS AUTOMATIC TAGS ::= BEGIN diff --git a/tests/23-bits-OK.asn1.-EF b/tests/23-bits-OK.asn1.-EF index f74b9677..80648156 100644 --- a/tests/23-bits-OK.asn1.-EF +++ b/tests/23-bits-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestBitString { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 23 } +ModuleTestBitString { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 23 } DEFINITIONS AUTOMATIC TAGS ::= BEGIN diff --git a/tests/24-sequence-OK.asn1.-EF b/tests/24-sequence-OK.asn1.-EF index fefe5590..ecdc4b09 100644 --- a/tests/24-sequence-OK.asn1.-EF +++ b/tests/24-sequence-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestSequence { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 24 } +ModuleTestSequence { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 24 } DEFINITIONS IMPLICIT TAGS ::= BEGIN diff --git a/tests/31-set-of-OK.asn1.-EF b/tests/31-set-of-OK.asn1.-EF index 81d3567e..f97ce2a3 100644 --- a/tests/31-set-of-OK.asn1.-EF +++ b/tests/31-set-of-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestSetOfSimple { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 31 } +ModuleTestSetOfSimple { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 31 } DEFINITIONS IMPLICIT TAGS ::= BEGIN diff --git a/tests/32-sequence-of-OK.asn1.-EF b/tests/32-sequence-of-OK.asn1.-EF index a2843c2f..d0059b21 100644 --- a/tests/32-sequence-of-OK.asn1.-EF +++ b/tests/32-sequence-of-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestSequenceSimple { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 32 } +ModuleTestSequenceSimple { iso org(3) dod(6) internet(1) private(4) + enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 32 } DEFINITIONS IMPLICIT TAGS ::= BEGIN diff --git a/tests/34-class-OK.asn1.-EF b/tests/34-class-OK.asn1.-EF index 25d21aa5..8af80a86 100644 --- a/tests/34-class-OK.asn1.-EF +++ b/tests/34-class-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestClassSimple { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 34 } +ModuleTestClassSimple { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 34 } DEFINITIONS IMPLICIT TAGS ::= BEGIN diff --git a/tests/34-class-OK.asn1.-EFprint-class-matrix b/tests/34-class-OK.asn1.-EFprint-class-matrix index 92b4b4c7..f97de09d 100644 --- a/tests/34-class-OK.asn1.-EFprint-class-matrix +++ b/tests/34-class-OK.asn1.-EFprint-class-matrix @@ -1,8 +1,5 @@ -ModuleTestClassSimple { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 34 } +ModuleTestClassSimple { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 34 } DEFINITIONS IMPLICIT TAGS ::= BEGIN diff --git a/tests/37-indirect-choice-OK.asn1.-EF b/tests/37-indirect-choice-OK.asn1.-EF index 8cf19b30..b4031a8c 100644 --- a/tests/37-indirect-choice-OK.asn1.-EF +++ b/tests/37-indirect-choice-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestIndirectChoiceFine { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 37 } +ModuleTestIndirectChoiceFine { iso org(3) dod(6) internet(1) private(4) + enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 37 } DEFINITIONS IMPLICIT TAGS ::= BEGIN diff --git a/tests/42-real-life-OK.asn1.-EF b/tests/42-real-life-OK.asn1.-EF index c5e17e11..0543ee32 100644 --- a/tests/42-real-life-OK.asn1.-EF +++ b/tests/42-real-life-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleLAPStorage { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 42 } +ModuleLAPStorage { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 42 } DEFINITIONS EXTENSIBILITY IMPLIED ::= BEGIN diff --git a/tests/45-undefined-type-SE.asn1.-EFfknown-extern-type=KnownExt b/tests/45-undefined-type-SE.asn1.-EFfknown-extern-type=KnownExt index 0abf7cce..994a8901 100644 --- a/tests/45-undefined-type-SE.asn1.-EFfknown-extern-type=KnownExt +++ b/tests/45-undefined-type-SE.asn1.-EFfknown-extern-type=KnownExt @@ -1,8 +1,5 @@ -ModuleKnownExternType { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 45 } +ModuleKnownExternType { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 45 } DEFINITIONS ::= BEGIN diff --git a/tests/49-real-life-OK.asn1.-E b/tests/49-real-life-OK.asn1.-E index ebb949fb..018bc6bd 100644 --- a/tests/49-real-life-OK.asn1.-E +++ b/tests/49-real-life-OK.asn1.-E @@ -1,8 +1,5 @@ -ModuleSetChoiceExtensibility { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 49 } +ModuleSetChoiceExtensibility { iso org(3) dod(6) internet(1) private(4) + enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 49 } DEFINITIONS ::= BEGIN diff --git a/tests/50-constraint-OK.asn1.-EFprint-constraints b/tests/50-constraint-OK.asn1.-EFprint-constraints Binary files differindex 6f2d72e7..2ac12852 100644 --- a/tests/50-constraint-OK.asn1.-EFprint-constraints +++ b/tests/50-constraint-OK.asn1.-EFprint-constraints diff --git a/tests/55-components-of-OK.asn1.-EF b/tests/55-components-of-OK.asn1.-EF index 858cca8e..fb2f76df 100644 --- a/tests/55-components-of-OK.asn1.-EF +++ b/tests/55-components-of-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestComponentsOf { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 55 } +ModuleTestComponentsOf { iso org(3) dod(6) internet(1) private(4) + enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 55 } DEFINITIONS AUTOMATIC TAGS ::= BEGIN diff --git a/tests/58-param-OK.asn1.-EF b/tests/58-param-OK.asn1.-EF index 72120df4..9258e5b2 100644 --- a/tests/58-param-OK.asn1.-EF +++ b/tests/58-param-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestParam { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 58 } +ModuleTestParam { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 58 } DEFINITIONS ::= BEGIN diff --git a/tests/60-any-OK.asn1.-EF b/tests/60-any-OK.asn1.-EF index 4f9864af..89fa31d7 100644 --- a/tests/60-any-OK.asn1.-EF +++ b/tests/60-any-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestANY { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 60 } +ModuleTestANY { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 60 } DEFINITIONS IMPLICIT TAGS ::= BEGIN diff --git a/tests/62-any-OK.asn1.-EF b/tests/62-any-OK.asn1.-EF index ffcf8cf4..0316412e 100644 --- a/tests/62-any-OK.asn1.-EF +++ b/tests/62-any-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestANYSyntax { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 62 } +ModuleTestANYSyntax { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 62 } DEFINITIONS IMPLICIT TAGS ::= BEGIN diff --git a/tests/70-xer-test-OK.asn1.-EF b/tests/70-xer-test-OK.asn1.-EF index 28eeabe9..983f40af 100644 --- a/tests/70-xer-test-OK.asn1.-EF +++ b/tests/70-xer-test-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestXERDecoding { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 70 } +ModuleTestXERDecoding { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 70 } DEFINITIONS AUTOMATIC TAGS ::= BEGIN diff --git a/tests/74-int-enum-constraints-OK.asn1.-EFprint-constraints b/tests/74-int-enum-constraints-OK.asn1.-EFprint-constraints index 029435a4..8f9cc6ba 100644 --- a/tests/74-int-enum-constraints-OK.asn1.-EFprint-constraints +++ b/tests/74-int-enum-constraints-OK.asn1.-EFprint-constraints @@ -1,7 +1,5 @@ -ModuleTestIntegerAndEnumeratedConstraints { iso - org(3) dod(6) internet(1) - private(4) enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) +ModuleTestIntegerAndEnumeratedConstraints { iso org(3) dod(6) internet(1) + private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 74 } DEFINITIONS ::= BEGIN diff --git a/tests/79-constrained-by-OK.asn1.-EF b/tests/79-constrained-by-OK.asn1.-EF index 35155c5d..f462be00 100644 --- a/tests/79-constrained-by-OK.asn1.-EF +++ b/tests/79-constrained-by-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestConstrainedBy { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 79 } +ModuleTestConstrainedBy { iso org(3) dod(6) internet(1) private(4) + enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 79 } DEFINITIONS ::= BEGIN diff --git a/tests/82-with-comps-OK.asn1.-EF b/tests/82-with-comps-OK.asn1.-EF index 601181ea..f4fe9aaa 100644 --- a/tests/82-with-comps-OK.asn1.-EF +++ b/tests/82-with-comps-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestWithComponents { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 82 } +ModuleTestWithComponents { iso org(3) dod(6) internet(1) private(4) + enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 82 } DEFINITIONS ::= BEGIN diff --git a/tests/84-param-tags-OK.asn1.-EF b/tests/84-param-tags-OK.asn1.-EF index 546f245c..a3074340 100644 --- a/tests/84-param-tags-OK.asn1.-EF +++ b/tests/84-param-tags-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTestParameterizationTags1 { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 84 1 } +ModuleTestParameterizationTags1 { iso org(3) dod(6) internet(1) private(4) + enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 84 1 } DEFINITIONS ::= BEGIN @@ -17,11 +14,8 @@ TestChoice ::= CHOICE { END -ModuleTestParameterizationTagsAuto2 { iso - org(3) dod(6) internet(1) - private(4) enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 84 2 } +ModuleTestParameterizationTagsAuto2 { iso org(3) dod(6) internet(1) private(4) + enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 84 2 } DEFINITIONS AUTOMATIC TAGS ::= BEGIN diff --git a/tests/86-atags-OK.asn1.-EF b/tests/86-atags-OK.asn1.-EF index 282c2744..ebadd3a5 100644 --- a/tests/86-atags-OK.asn1.-EF +++ b/tests/86-atags-OK.asn1.-EF @@ -1,8 +1,5 @@ -ModuleAutoTags { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 86 } +ModuleAutoTags { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 86 } DEFINITIONS AUTOMATIC TAGS ::= BEGIN diff --git a/tests/90-cond-int-type-OK.asn1.-EFprint-constraints b/tests/90-cond-int-type-OK.asn1.-EFprint-constraints index 51c68d03..fed0d333 100644 --- a/tests/90-cond-int-type-OK.asn1.-EFprint-constraints +++ b/tests/90-cond-int-type-OK.asn1.-EFprint-constraints @@ -1,8 +1,5 @@ -ModuleConditionalIntegerType { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 90 } +ModuleConditionalIntegerType { iso org(3) dod(6) internet(1) private(4) + enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 90 } DEFINITIONS ::= BEGIN diff --git a/tests/93-asn1c-controls-OK.asn1.-EF b/tests/93-asn1c-controls-OK.asn1.-EF index 353f15cc..5288379f 100644 --- a/tests/93-asn1c-controls-OK.asn1.-EF +++ b/tests/93-asn1c-controls-OK.asn1.-EF @@ -1,8 +1,5 @@ -Module-asn1c-controls { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 93 } +Module-asn1c-controls { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 93 } DEFINITIONS AUTOMATIC TAGS ::= BEGIN diff --git a/tests/97-type-identifier-SW.asn1.-EF b/tests/97-type-identifier-SW.asn1.-EF index 858e7988..71743b7a 100644 --- a/tests/97-type-identifier-SW.asn1.-EF +++ b/tests/97-type-identifier-SW.asn1.-EF @@ -1,8 +1,5 @@ -ModuleTypeIdentifier1 { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 97 1 } +ModuleTypeIdentifier1 { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 97 1 } DEFINITIONS ::= BEGIN @@ -19,11 +16,8 @@ TYPE-IDENTIFIER ::= CLASS { END -ModuleTypeIdentifier2 { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 97 2 } +ModuleTypeIdentifier2 { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 97 2 } DEFINITIONS ::= BEGIN diff --git a/tests/99-class-sample-OK.asn1.-EFprint-class-matrix b/tests/99-class-sample-OK.asn1.-EFprint-class-matrix index c240c80f..1f3519ee 100644 --- a/tests/99-class-sample-OK.asn1.-EFprint-class-matrix +++ b/tests/99-class-sample-OK.asn1.-EFprint-class-matrix @@ -1,8 +1,5 @@ -ModuleClassSample { iso org(3) - dod(6) internet(1) private(4) - enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) - 99 } +ModuleClassSample { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 99 } DEFINITIONS ::= BEGIN |