From 24810025758f65951aa17b7299b8788c19cdcf86 Mon Sep 17 00:00:00 2001 From: Lev Walkin <vlm@lionet.info> Date: Fri, 25 Aug 2017 12:16:11 -0700 Subject: [PATCH] remove warnings --- skeletons/OCTET_STRING.c | 4 ++-- skeletons/OCTET_STRING_oer.c | 4 ++-- skeletons/constr_SEQUENCE.c | 32 ++++++++++++++++++-------------- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/skeletons/OCTET_STRING.c b/skeletons/OCTET_STRING.c index 1b33c5ea..2c58cb4b 100644 --- a/skeletons/OCTET_STRING.c +++ b/skeletons/OCTET_STRING.c @@ -1616,7 +1616,7 @@ OCTET_STRING_encode_uper(asn_TYPE_descriptor_t *td, /* X.691, #16.6: short fixed length encoding (up to 2 octets) */ /* X.691, #16.7: long fixed length encoding (up to 64K octets) */ if(csiz->effective_bits >= 0) { - ASN_DEBUG("Encoding %d bytes (%ld), length in %d bits", + ASN_DEBUG("Encoding %zu bytes (%ld), length in %d bits", st->size, sizeinunits - csiz->lower_bound, csiz->effective_bits); ret = per_put_few_bits(po, sizeinunits - csiz->lower_bound, @@ -1634,7 +1634,7 @@ OCTET_STRING_encode_uper(asn_TYPE_descriptor_t *td, ASN__ENCODED_OK(er); } - ASN_DEBUG("Encoding %d bytes", st->size); + ASN_DEBUG("Encoding %zu bytes", st->size); if(sizeinunits == 0) { if(uper_put_length(po, 0)) diff --git a/skeletons/OCTET_STRING_oer.c b/skeletons/OCTET_STRING_oer.c index b30dbe70..8df3356a 100644 --- a/skeletons/OCTET_STRING_oer.c +++ b/skeletons/OCTET_STRING_oer.c @@ -116,7 +116,7 @@ OCTET_STRING_encode_oer(asn_TYPE_descriptor_t *td, if(!st) ASN__ENCODE_FAILED; - ASN_DEBUG("Encoding %s %d as OCTET STRING", td ? td->name : "", st->size); + ASN_DEBUG("Encoding %s %zu as OCTET STRING", td ? td->name : "", st->size); if(ct_size >= 0) { /* @@ -144,7 +144,7 @@ OCTET_STRING_encode_oer(asn_TYPE_descriptor_t *td, if(st->size != unit_bytes * (size_t)ct_size) { ASN_DEBUG( "Trying to encode %s (%zu bytes) which doesn't fit SIZE " - "constraint (%d)", + "constraint (%zu)", td->name, st->size, ct_size); ASN__ENCODE_FAILED; } diff --git a/skeletons/constr_SEQUENCE.c b/skeletons/constr_SEQUENCE.c index 9a9e373e..b863d5f3 100644 --- a/skeletons/constr_SEQUENCE.c +++ b/skeletons/constr_SEQUENCE.c @@ -202,7 +202,7 @@ SEQUENCE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, /* * MICROPHASE 1: Synchronize decoding. */ - ASN_DEBUG("In %s SEQUENCE left %d, edx=%u flags=%d" + ASN_DEBUG("In %s SEQUENCE left %d, edx=%zu flags=%d" " opt=%d ec=%d", td->name, (int)ctx->left, edx, elements[edx].flags, elements[edx].optional, @@ -231,7 +231,7 @@ SEQUENCE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, * Fetch the T from TLV. */ tag_len = ber_fetch_tag(ptr, LEFT, &tlv_tag); - ASN_DEBUG("Current tag in %s SEQUENCE for element %d " + ASN_DEBUG("Current tag in %s SEQUENCE for element %zu " "(%s) is %s encoded in %d bytes, of frame %ld", td->name, edx, elements[edx].name, ber_tlv_tag_string(tlv_tag), (int)tag_len, (long)LEFT); @@ -350,7 +350,7 @@ SEQUENCE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, */ if(!IN_EXTENSION_GROUP(specs, edx + elements[edx].optional)) { - ASN_DEBUG("Unexpected tag %s (at %d)", + ASN_DEBUG("Unexpected tag %s (at %zu)", ber_tlv_tag_string(tlv_tag), edx); ASN_DEBUG("Expected tag %s (%s)%s", ber_tlv_tag_string(elements[edx].tag), @@ -363,7 +363,7 @@ SEQUENCE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, ssize_t skip; edx += elements[edx].optional; - ASN_DEBUG("Skipping unexpected %s (at %d)", + ASN_DEBUG("Skipping unexpected %s (at %zu)", ber_tlv_tag_string(tlv_tag), edx); skip = ber_skip_length(opt_codec_ctx, BER_TLV_CONSTRUCTED(ptr), @@ -414,7 +414,7 @@ SEQUENCE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, elements[edx].type, memb_ptr2, ptr, LEFT, elements[edx].tag_mode); - ASN_DEBUG("In %s SEQUENCE decoded %d %s of %d " + ASN_DEBUG("In %s SEQUENCE decoded %zu %s of %d " "in %d bytes rval.code %d, size=%d", td->name, edx, elements[edx].type->name, (int)LEFT, (int)rval.consumed, rval.code, (int)size); @@ -544,7 +544,7 @@ SEQUENCE_encode_der(asn_TYPE_descriptor_t *td, if(erval.encoded == -1) return erval; computed_size += erval.encoded; - ASN_DEBUG("Member %d %s estimated %ld bytes", + ASN_DEBUG("Member %zu %s estimated %ld bytes", edx, elm->name, (long)erval.encoded); } @@ -579,7 +579,7 @@ SEQUENCE_encode_der(asn_TYPE_descriptor_t *td, if(tmperval.encoded == -1) return tmperval; computed_size -= tmperval.encoded; - ASN_DEBUG("Member %d %s of SEQUENCE %s encoded in %ld bytes", + ASN_DEBUG("Member %zu %s of SEQUENCE %s encoded in %ld bytes", edx, elm->name, td->name, (long)tmperval.encoded); } @@ -766,7 +766,7 @@ SEQUENCE_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, case XCT_UNKNOWN_OP: case XCT_UNKNOWN_BO: - ASN_DEBUG("XER/SEQUENCE: tcv=%d, ph=%d, edx=%d", + ASN_DEBUG("XER/SEQUENCE: tcv=%d, ph=%d, edx=%zu", tcv, ctx->phase, edx); if(ctx->phase != 1) { break; /* Really unexpected */ @@ -805,7 +805,7 @@ SEQUENCE_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, if(n != edx_end) continue; } else { - ASN_DEBUG("Out of defined members: %d/%d", + ASN_DEBUG("Out of defined members: %zu/%u", edx, td->elements_count); } @@ -813,7 +813,7 @@ SEQUENCE_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, if(IN_EXTENSION_GROUP(specs, edx + (edx < td->elements_count ? elements[edx].optional : 0))) { - ASN_DEBUG("Got anticipated extension at %d", + ASN_DEBUG("Got anticipated extension at %zu", edx); /* * Check for (XCT_BOTH or XCT_UNKNOWN_BO) @@ -1036,6 +1036,8 @@ SEQUENCE_constraint(asn_TYPE_descriptor_t *td, const void *sptr, return 0; } +#ifndef ASN_DISABLE_PER_SUPPORT + asn_dec_rval_t SEQUENCE_decode_uper(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, const asn_per_constraints_t *constraints, void **sptr, @@ -1183,7 +1185,7 @@ SEQUENCE_decode_uper(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, int present; if(!IN_EXTENSION_GROUP(specs, edx)) { - ASN_DEBUG("%d is not extension", edx); + ASN_DEBUG("%zu is not an extension", edx); continue; } @@ -1277,7 +1279,7 @@ SEQUENCE_handle_extensions(asn_TYPE_descriptor_t *td, void *sptr, int present; if(!IN_EXTENSION_GROUP(specs, edx)) { - ASN_DEBUG("%s (@%d) is not extension", elm->type->name, edx); + ASN_DEBUG("%s (@%zu) is not extension", elm->type->name, edx); continue; } @@ -1291,7 +1293,7 @@ SEQUENCE_handle_extensions(asn_TYPE_descriptor_t *td, void *sptr, present = 1; } - ASN_DEBUG("checking %s (@%d) present => %d", + ASN_DEBUG("checking %s (@%zu) present => %d", elm->type->name, edx, present); exts_count++; exts_present += present; @@ -1397,7 +1399,7 @@ SEQUENCE_encode_uper(asn_TYPE_descriptor_t *td, if(elm->flags & ATF_POINTER) { memb_ptr2 = (void **)((char *)sptr + elm->memb_offset); if(!*memb_ptr2) { - ASN_DEBUG("Element %s %d not present", + ASN_DEBUG("Element %s %zu not present", elm->name, edx); if(elm->optional) continue; @@ -1442,6 +1444,8 @@ SEQUENCE_encode_uper(asn_TYPE_descriptor_t *td, ASN__ENCODED_OK(er); } +#endif /* ASN_DISABLE_PER_SUPPORT */ + int SEQUENCE_compare(const asn_TYPE_descriptor_t *td, const void *aptr, const void *bptr) { -- 2.26.2