osmocom
/
asn1c
mirror of https://gerrit.osmocom.org/asn1c
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #168 from brchiu/fix_compile_J2735_issue 

Fix compile SAE J2735_201603DA.ASN issue
This commit is contained in:
Lev Walkin 2017-08-05 18:10:08 -07:00 committed by GitHub
parent fb35e08884 94f0b645d4
commit 92fc0130ac
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libasn1compiler/asn1c_C.c
View File

@ -3005,8 +3005,6 @@ out_name_chain(arg_t *arg, enum onc_flags onc_flags) {
asn1p_expr_t *expr = arg->expr;
char *id;
assert(expr->Identifier);
if((arg->flags & A1C_COMPOUND_NAMES
|| onc_flags & ONC_force_compound_name)
&& ((expr->expr_type & ASN_CONSTR_MASK)
@ -3015,8 +3013,8 @@ out_name_chain(arg_t *arg, enum onc_flags onc_flags) {
|| expr->expr_type == ASN_BASIC_BIT_STRING)
&& expr_elements_count(arg, expr))
)
&& expr->parent_expr
&& expr->parent_expr->Identifier) {
&& expr->parent_expr) {
arg_t tmparg = *arg;
tmparg.expr = expr->parent_expr;
@ -3024,7 +3022,7 @@ out_name_chain(arg_t *arg, enum onc_flags onc_flags) {
out_name_chain(&tmparg, onc_flags);
OUT("__"); /* a separator between id components */
if(expr->parent_expr->Identifier) OUT("__"); /* a separator between id components */
/* Fall through */
}

2
libasn1compiler/asn1c_misc.c
View File

@ -221,7 +221,7 @@ asn1c_type_name(arg_t *arg, asn1p_expr_t *expr, enum tnfmt _format) {
}
}
if(_format != TNF_RSAFE && terminal && terminal->spec_index != -1) {
if(_format != TNF_RSAFE && terminal && ((terminal->spec_index != -1) || (terminal->_mark & TM_NAMECLASH))) {
exprid = terminal;
typename = 0;
}