Commit 8f294e08 authored by Lev Walkin's avatar Lev Walkin

fixes

parent 778556fa
...@@ -64,7 +64,8 @@ asn1f_fix_parametrized_assignment(arg_t *arg) { ...@@ -64,7 +64,8 @@ asn1f_fix_parametrized_assignment(arg_t *arg) {
&& (from)->tag.tag_class) { \ && (from)->tag.tag_class) { \
FATAL("Layered tagging in parametrization " \ FATAL("Layered tagging in parametrization " \
"is not yet supported, " \ "is not yet supported, " \
"contact asn1c author for assistance with"); \ "contact asn1c author for assistance " \
"with line %d", (to)->_lineno); \
return -1; \ return -1; \
} \ } \
/* This code shall not be invoked too early */ \ /* This code shall not be invoked too early */ \
......
...@@ -144,7 +144,7 @@ asn1p_expr_free(asn1p_expr_t *expr) { ...@@ -144,7 +144,7 @@ asn1p_expr_free(asn1p_expr_t *expr) {
char *asn1p_tag2string(struct asn1p_type_tag_s *tag, char *buf) { char *asn1p_tag2string(struct asn1p_type_tag_s *tag, char *buf) {
static buf_stat[TAG2STRING_BUFFER_SIZE]; static char buf_stat[TAG2STRING_BUFFER_SIZE];
char *start; char *start;
char *end; char *end;
...@@ -170,7 +170,7 @@ char *asn1p_tag2string(struct asn1p_type_tag_s *tag, char *buf) { ...@@ -170,7 +170,7 @@ char *asn1p_tag2string(struct asn1p_type_tag_s *tag, char *buf) {
} }
buf += snprintf(buf + strlen(buf), end - buf, buf += snprintf(buf + strlen(buf), end - buf,
"%" PRIdASN "]", tag->tag_value); "%" PRIdASN "]", tag->tag_value);
assert((buf - end) > sizeof(" IMPLICIT ")); assert((unsigned int)(buf - end) > sizeof(" IMPLICIT "));
switch(tag->tag_mode) { switch(tag->tag_mode) {
case TM_DEFAULT: break; case TM_DEFAULT: break;
......
...@@ -394,7 +394,7 @@ static const short yyrline[] = { 0, ...@@ -394,7 +394,7 @@ static const short yyrline[] = { 0,
1876, 1879, 1884, 1906, 1911, 1916, 1922, 1928, 1936, 1944, 1876, 1879, 1884, 1906, 1911, 1916, 1922, 1928, 1936, 1944,
1952, 1959, 1969, 1974, 2004, 2006, 2009, 2016, 2022, 2024, 1952, 1959, 1969, 1974, 2004, 2006, 2009, 2016, 2022, 2024,
2025, 2026, 2029, 2031, 2032, 2035, 2040, 2047, 2054, 2056, 2025, 2026, 2029, 2031, 2032, 2035, 2040, 2047, 2054, 2056,
2060 2061
}; };
#endif #endif
...@@ -3410,7 +3410,7 @@ case 270: ...@@ -3410,7 +3410,7 @@ case 270:
; ;
break;} break;}
case 271: case 271:
#line 2061 "asn1p_y.y" #line 2062 "asn1p_y.y"
{ {
checkmem(yyvsp[0].tv_str); checkmem(yyvsp[0].tv_str);
yyval.tv_str = yyvsp[0].tv_str; yyval.tv_str = yyvsp[0].tv_str;
...@@ -3490,7 +3490,7 @@ yyerrlab: /* here on detecting error */ ...@@ -3490,7 +3490,7 @@ yyerrlab: /* here on detecting error */
count = 0; count = 0;
/* Start X at -yyn if nec to avoid negative indexes in yycheck. */ /* Start X at -yyn if nec to avoid negative indexes in yycheck. */
for (x = (yyn < 0 ? -yyn : 0); for (x = (yyn < 0 ? -yyn : 0);
x < (ssize_t)(sizeof(yytname) / sizeof(char *)); x++) x < (sizeof(yytname) / sizeof(char *)); x++)
if (yycheck[x + yyn] == x) if (yycheck[x + yyn] == x)
size += strlen(yytname[x]) + 15, count++; size += strlen(yytname[x]) + 15, count++;
msg = (char *) malloc(size + 15); msg = (char *) malloc(size + 15);
...@@ -3502,7 +3502,7 @@ yyerrlab: /* here on detecting error */ ...@@ -3502,7 +3502,7 @@ yyerrlab: /* here on detecting error */
{ {
count = 0; count = 0;
for (x = (yyn < 0 ? -yyn : 0); for (x = (yyn < 0 ? -yyn : 0);
x < (ssize_t)(sizeof(yytname) / sizeof(char *)); x++) x < (sizeof(yytname) / sizeof(char *)); x++)
if (yycheck[x + yyn] == x) if (yycheck[x + yyn] == x)
{ {
strcat(msg, count == 0 ? ", expecting `" : " or `"); strcat(msg, count == 0 ? ", expecting `" : " or `");
...@@ -3638,7 +3638,7 @@ yyerrhandle: ...@@ -3638,7 +3638,7 @@ yyerrhandle:
} }
return 1; return 1;
} }
#line 2067 "asn1p_y.y" #line 2068 "asn1p_y.y"
......
...@@ -2056,6 +2056,7 @@ optIdentifier: ...@@ -2056,6 +2056,7 @@ optIdentifier:
| Identifier { | Identifier {
$$ = $1; $$ = $1;
} }
;
Identifier: Identifier:
TOK_identifier { TOK_identifier {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment