diff options
| -rw-r--r-- | skeletons/OCTET_STRING.c | 26 | ||||
| -rw-r--r-- | skeletons/constr_CHOICE.c | 3 | ||||
| -rw-r--r-- | skeletons/constr_SEQUENCE.c | 3 |
3 files changed, 18 insertions, 14 deletions
diff --git a/skeletons/OCTET_STRING.c b/skeletons/OCTET_STRING.c index b44228c4..b99bcbde 100644 --- a/skeletons/OCTET_STRING.c +++ b/skeletons/OCTET_STRING.c @@ -246,10 +246,10 @@ OCTET_STRING_decode_ber(asn_codec_ctx_t *opt_codec_ctx, ?(ssize_t)size:sel->left); - ASN_DEBUG("%p, s->l=%d, s->wn=%d, s->g=%d\n", sel, - sel?sel->left:0, - sel?sel->want_nulls:0, - sel?sel->got:0 + ASN_DEBUG("%p, s->l=%ld, s->wn=%ld, s->g=%ld\n", sel, + (long)sel?sel->left:0, + (long)sel?sel->want_nulls:0, + (long)sel?sel->got:0 ); if(sel && sel->left <= 0 && sel->want_nulls == 0) { if(sel->prev) { @@ -271,9 +271,10 @@ OCTET_STRING_decode_ber(asn_codec_ctx_t *opt_codec_ctx, } tl = ber_fetch_tag(buf_ptr, Left, &tlv_tag); - ASN_DEBUG("fetch tag(size=%d,L=%d), %sstack, left=%d, wn=%d, tl=%d", - (int)size, Left, sel?"":"!", - sel?sel->left:0, sel?sel->want_nulls:0, tl); + ASN_DEBUG("fetch tag(size=%ld,L=%ld), %sstack, left=%ld, wn=%ld, tl=%ld", + (long)size, (long)Left, sel?"":"!", + (long)sel?sel->left:0, (long)sel?sel->want_nulls:0, + (long)tl); switch(tl) { case -1: RETURN(RC_FAIL); case 0: RETURN(RC_WMORE); @@ -392,8 +393,9 @@ OCTET_STRING_decode_ber(asn_codec_ctx_t *opt_codec_ctx, sel->got += tlvl; ADVANCE(tlvl); - ASN_DEBUG("+EXPECT2 got=%d left=%d, wn=%d, clvl=%d", - sel->got, sel->left, sel->want_nulls, sel->cont_level); + ASN_DEBUG("+EXPECT2 got=%ld left=%ld, wn=%d, clvl=%d", + (long)sel->got, (long)sel->left, + sel->want_nulls, sel->cont_level); } while(tlv_constr); if(sel == NULL) { @@ -495,10 +497,10 @@ OCTET_STRING_decode_ber(asn_codec_ctx_t *opt_codec_ctx, st->buf[st->size-1] &= 0xff << st->bits_unused; } - ASN_DEBUG("Took %d bytes to encode %s: [%s]:%d", - consumed_myself, td->name, + ASN_DEBUG("Took %ld bytes to encode %s: [%s]:%ld", + (long)consumed_myself, td->name, (type_variant == _TT_GENERIC) ? (char *)st->buf : "<data>", - st->size); + (long)st->size); RETURN(RC_OK); diff --git a/skeletons/constr_CHOICE.c b/skeletons/constr_CHOICE.c index cbd85790..fac93a52 100644 --- a/skeletons/constr_CHOICE.c +++ b/skeletons/constr_CHOICE.c @@ -603,10 +603,11 @@ CHOICE_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, */ if(ctx->phase == 2) { asn_dec_rval_t tmprval; - elm = &td->elements[edx]; void *memb_ptr; /* Pointer to the member */ void **memb_ptr2; /* Pointer to that pointer */ + elm = &td->elements[edx]; + if(elm->flags & ATF_POINTER) { /* Member is a pointer to another structure */ memb_ptr2 = (void **)((char *)st diff --git a/skeletons/constr_SEQUENCE.c b/skeletons/constr_SEQUENCE.c index ca0766d3..1624abbd 100644 --- a/skeletons/constr_SEQUENCE.c +++ b/skeletons/constr_SEQUENCE.c @@ -652,10 +652,11 @@ SEQUENCE_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, */ if(ctx->phase == 2) { asn_dec_rval_t tmprval; - elm = &td->elements[edx]; void *memb_ptr; /* Pointer to the member */ void **memb_ptr2; /* Pointer to that pointer */ + elm = &td->elements[edx]; + if(elm->flags & ATF_POINTER) { /* Member is a pointer to another structure */ memb_ptr2 = (void **)((char *)st |