From f16efeb4f4a22396a91ca2c4bd8bcfae7a90d315 Mon Sep 17 00:00:00 2001 From: vlm Date: Sun, 27 Nov 2005 12:54:20 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@1014 59561ff5-6e30-0410-9f3c-9617f08c8826 --- skeletons/constr_SET_OF.c | 2 +- tests/31-set-of-OK.asn1 | 2 - tests/31-set-of-OK.asn1.-EF | 2 - tests/31-set-of-OK.asn1.-P | 165 ------------------------------------ 4 files changed, 1 insertion(+), 170 deletions(-) diff --git a/skeletons/constr_SET_OF.c b/skeletons/constr_SET_OF.c index 251da390..103817b4 100644 --- a/skeletons/constr_SET_OF.c +++ b/skeletons/constr_SET_OF.c @@ -901,7 +901,7 @@ SET_OF_decode_uper(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, nelems = uper_get_length(pd, ct ? ct->effective_bits : -1, &repeat); ASN_DEBUG("Got to decode %d elements (eff %d)", - nelems, ct ? ct->effective_bits : -1); + (int)nelems, (int)ct ? ct->effective_bits : -1); if(nelems < 0) _ASN_DECODE_FAILED; } diff --git a/tests/31-set-of-OK.asn1 b/tests/31-set-of-OK.asn1 index ddfe51c7..c8fa51eb 100644 --- a/tests/31-set-of-OK.asn1 +++ b/tests/31-set-of-OK.asn1 @@ -37,6 +37,4 @@ BEGIN -- not to the SET OF's embedded SEQUENCE! } - SSS ::= SEQUENCE OF SET OF SEQUENCE OF BIT STRING - END diff --git a/tests/31-set-of-OK.asn1.-EF b/tests/31-set-of-OK.asn1.-EF index bf6f99d8..f97ce2a3 100644 --- a/tests/31-set-of-OK.asn1.-EF +++ b/tests/31-set-of-OK.asn1.-EF @@ -23,6 +23,4 @@ Stuff ::= SET { } } -SSS ::= SEQUENCE OF SET OF SEQUENCE OF BIT STRING - END diff --git a/tests/31-set-of-OK.asn1.-P b/tests/31-set-of-OK.asn1.-P index 23cf7f0d..e53bfb48 100644 --- a/tests/31-set-of-OK.asn1.-P +++ b/tests/31-set-of-OK.asn1.-P @@ -520,168 +520,3 @@ asn_TYPE_descriptor_t asn_DEF_Stuff = { &asn_SPC_Stuff_specs_1 /* Additional specs */ }; - -/*** <<< INCLUDES [SSS] >>> ***/ - -#include -#include -#include -#include -#include - -/*** <<< TYPE-DECLS [SSS] >>> ***/ - -typedef struct SSS { - A_SEQUENCE_OF(struct Member { - A_SET_OF(struct Member { - A_SEQUENCE_OF(BIT_STRING_t) list; - - /* Context for parsing across buffer boundaries */ - asn_struct_ctx_t _asn_ctx; - } ) list; - - /* Context for parsing across buffer boundaries */ - asn_struct_ctx_t _asn_ctx; - } ) list; - - /* Context for parsing across buffer boundaries */ - asn_struct_ctx_t _asn_ctx; -} SSS_t; - -/*** <<< FUNC-DECLS [SSS] >>> ***/ - -extern asn_TYPE_descriptor_t asn_DEF_SSS; - -/*** <<< STAT-DEFS [SSS] >>> ***/ - -static asn_TYPE_member_t asn_MBR_Member_3[] = { - { ATF_POINTER, 0, 0, - .tag = (ASN_TAG_CLASS_UNIVERSAL | (3 << 2)), - .tag_mode = 0, - .type = &asn_DEF_BIT_STRING, - .memb_constraints = 0, /* Defer constraints checking to the member type */ - .per_constraints = 0, /* PER is not compiled, use -gen-PER */ - .default_value = 0, - .name = "" - }, -}; -static ber_tlv_tag_t asn_DEF_Member_tags_3[] = { - (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) -}; -static asn_SET_OF_specifics_t asn_SPC_Member_specs_3 = { - sizeof(struct Member), - offsetof(struct Member, _asn_ctx), - 0, /* XER encoding is XMLDelimitedItemList */ -}; -static /* Use -fall-defs-global to expose */ -asn_TYPE_descriptor_t asn_DEF_Member_3 = { - "SEQUENCE OF", - "SEQUENCE_OF", - SEQUENCE_OF_free, - SEQUENCE_OF_print, - SEQUENCE_OF_constraint, - SEQUENCE_OF_decode_ber, - SEQUENCE_OF_encode_der, - SEQUENCE_OF_decode_xer, - SEQUENCE_OF_encode_xer, - 0, /* No PER decoder, -gen-PER to enable */ - 0, /* Use generic outmost tag fetcher */ - asn_DEF_Member_tags_3, - sizeof(asn_DEF_Member_tags_3) - /sizeof(asn_DEF_Member_tags_3[0]), /* 1 */ - asn_DEF_Member_tags_3, /* Same as above */ - sizeof(asn_DEF_Member_tags_3) - /sizeof(asn_DEF_Member_tags_3[0]), /* 1 */ - 0, /* No PER visible constraints */ - asn_MBR_Member_3, - 1, /* Single element */ - &asn_SPC_Member_specs_3 /* Additional specs */ -}; - -static asn_TYPE_member_t asn_MBR_Member_2[] = { - { ATF_POINTER, 0, 0, - .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), - .tag_mode = 0, - .type = &asn_DEF_Member_3, - .memb_constraints = 0, /* Defer constraints checking to the member type */ - .per_constraints = 0, /* PER is not compiled, use -gen-PER */ - .default_value = 0, - .name = "" - }, -}; -static ber_tlv_tag_t asn_DEF_Member_tags_2[] = { - (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)) -}; -static asn_SET_OF_specifics_t asn_SPC_Member_specs_2 = { - sizeof(struct Member), - offsetof(struct Member, _asn_ctx), - 0, /* XER encoding is XMLDelimitedItemList */ -}; -static /* Use -fall-defs-global to expose */ -asn_TYPE_descriptor_t asn_DEF_Member_2 = { - "SET OF", - "SET_OF", - SET_OF_free, - SET_OF_print, - SET_OF_constraint, - SET_OF_decode_ber, - SET_OF_encode_der, - SET_OF_decode_xer, - SET_OF_encode_xer, - 0, /* No PER decoder, -gen-PER to enable */ - 0, /* Use generic outmost tag fetcher */ - asn_DEF_Member_tags_2, - sizeof(asn_DEF_Member_tags_2) - /sizeof(asn_DEF_Member_tags_2[0]), /* 1 */ - asn_DEF_Member_tags_2, /* Same as above */ - sizeof(asn_DEF_Member_tags_2) - /sizeof(asn_DEF_Member_tags_2[0]), /* 1 */ - 0, /* No PER visible constraints */ - asn_MBR_Member_2, - 1, /* Single element */ - &asn_SPC_Member_specs_2 /* Additional specs */ -}; - -static asn_TYPE_member_t asn_MBR_SSS_1[] = { - { ATF_POINTER, 0, 0, - .tag = (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), - .tag_mode = 0, - .type = &asn_DEF_Member_2, - .memb_constraints = 0, /* Defer constraints checking to the member type */ - .per_constraints = 0, /* PER is not compiled, use -gen-PER */ - .default_value = 0, - .name = "" - }, -}; -static ber_tlv_tag_t asn_DEF_SSS_tags_1[] = { - (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) -}; -static asn_SET_OF_specifics_t asn_SPC_SSS_specs_1 = { - sizeof(struct SSS), - offsetof(struct SSS, _asn_ctx), - 0, /* XER encoding is XMLDelimitedItemList */ -}; -asn_TYPE_descriptor_t asn_DEF_SSS = { - "SSS", - "SSS", - SEQUENCE_OF_free, - SEQUENCE_OF_print, - SEQUENCE_OF_constraint, - SEQUENCE_OF_decode_ber, - SEQUENCE_OF_encode_der, - SEQUENCE_OF_decode_xer, - SEQUENCE_OF_encode_xer, - 0, /* No PER decoder, -gen-PER to enable */ - 0, /* Use generic outmost tag fetcher */ - asn_DEF_SSS_tags_1, - sizeof(asn_DEF_SSS_tags_1) - /sizeof(asn_DEF_SSS_tags_1[0]), /* 1 */ - asn_DEF_SSS_tags_1, /* Same as above */ - sizeof(asn_DEF_SSS_tags_1) - /sizeof(asn_DEF_SSS_tags_1[0]), /* 1 */ - 0, /* No PER visible constraints */ - asn_MBR_SSS_1, - 1, /* Single element */ - &asn_SPC_SSS_specs_1 /* Additional specs */ -}; -