laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/33733 )
Change subject: src/rspro: regenerate to fix misleading indents ......................................................................
src/rspro: regenerate to fix misleading indents
After upgrading our CI environment to use Debian 12 with GCC 12, it complains about the following misleading indentations. Regenerate the rspro code with asn1c I2260df8f8ab8eaf5c2aac3c330f87dba4691c01e to be able to compile with --enable-werror again.
The asn_internal.h file is left unchanged to preserve changes from I14fff863449971024002e0d5465fb7a964d67095.
Related: OS#6057 Change-Id: Icc2e8da7232a93b04ac8f23800380ca9317bd60f --- M src/rspro/INTEGER.c M src/rspro/ResetStateReq.c M src/rspro/ResetStateRes.c M src/rspro/constr_CHOICE.c M src/rspro/per_decoder.c 5 files changed, 26 insertions(+), 7 deletions(-)
Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved
diff --git a/src/rspro/INTEGER.c b/src/rspro/INTEGER.c index b3f0da1..042fd75 100644 --- a/src/rspro/INTEGER.c +++ b/src/rspro/INTEGER.c @@ -775,8 +775,8 @@ ? asn_ulong2INTEGER(st, value) : asn_long2INTEGER(st, value)) _ASN_DECODE_FAILED; - ASN_DEBUG("Got value %ld + low %lld", - value, ct->lower_bound); + ASN_DEBUG("Got value %ld + low %lld", + value, ct->lower_bound); } return rval; } else { diff --git a/src/rspro/ResetStateReq.c b/src/rspro/ResetStateReq.c index 538a18c..e7774df 100644 --- a/src/rspro/ResetStateReq.c +++ b/src/rspro/ResetStateReq.c @@ -4,7 +4,7 @@ * found in "../../asn1/RSPRO.asn" */
-#include "ResetStateReq.h" +#include <osmocom/rspro/ResetStateReq.h>
static const ber_tlv_tag_t asn_DEF_ResetStateReq_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) diff --git a/src/rspro/ResetStateRes.c b/src/rspro/ResetStateRes.c index 551dcc4..92909df 100644 --- a/src/rspro/ResetStateRes.c +++ b/src/rspro/ResetStateRes.c @@ -4,7 +4,7 @@ * found in "../../asn1/RSPRO.asn" */
-#include "ResetStateRes.h" +#include <osmocom/rspro/ResetStateRes.h>
static asn_TYPE_member_t asn_MBR_ResetStateRes_1[] = { { ATF_NOFLAGS, 0, offsetof(struct ResetStateRes, result), diff --git a/src/rspro/constr_CHOICE.c b/src/rspro/constr_CHOICE.c index 6a88b29..4e95e1d 100644 --- a/src/rspro/constr_CHOICE.c +++ b/src/rspro/constr_CHOICE.c @@ -1134,8 +1134,8 @@ if(per_put_few_bits(po, present, ct->range_bits)) _ASN_ENCODE_FAILED;
- return elm->type->aper_encoder(elm->type, elm->per_constraints, - memb_ptr, po); + return elm->type->aper_encoder(elm->type, elm->per_constraints, + memb_ptr, po); } else { asn_enc_rval_t rval; if(specs->ext_start == -1) diff --git a/src/rspro/per_decoder.c b/src/rspro/per_decoder.c index 20fe1a1..b5056b5 100644 --- a/src/rspro/per_decoder.c +++ b/src/rspro/per_decoder.c @@ -160,7 +160,7 @@ */ if(!td->aper_decoder) _ASN_DECODE_FAILED; /* PER is not compiled in */ - rval = td->aper_decoder(opt_codec_ctx, td, 0, sptr, &pd); + rval = td->aper_decoder(opt_codec_ctx, td, 0, sptr, &pd); if(rval.code == RC_OK) { /* Return the number of consumed bits */ rval.consumed = ((pd.buffer - (const uint8_t *)buffer) << 3)