*** empty log message ***
git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@1132 59561ff5-6e30-0410-9f3c-9617f08c8826
diff --git a/libasn1parser/asn1p_class.c b/libasn1parser/asn1p_class.c
index 585ec93..c6e6c3d 100644
--- a/libasn1parser/asn1p_class.c
+++ b/libasn1parser/asn1p_class.c
@@ -154,19 +154,19 @@
}
asn1p_wsyntx_chunk_t *
-asn1p_wsyntx_chunk_frombuf(char *buf, int len, int do_copy) {
+asn1p_wsyntx_chunk_fromstring(char *token, int do_copy) {
asn1p_wsyntx_chunk_t *wc;
if(do_copy) {
static asn1p_wsyntx_chunk_t tmp;
tmp.type = WC_LITERAL;
- tmp.content.token = buf;
+ tmp.content.token = token;
wc = asn1p_wsyntx_chunk_clone(&tmp);
} else {
wc = asn1p_wsyntx_chunk_new();
if(wc) {
wc->type = WC_LITERAL;
- wc->content.token = buf;
+ wc->content.token = token;
}
}
diff --git a/libasn1parser/asn1p_class.h b/libasn1parser/asn1p_class.h
index 5d55a73..571be61 100644
--- a/libasn1parser/asn1p_class.h
+++ b/libasn1parser/asn1p_class.h
@@ -69,7 +69,7 @@
* 0: Component has been added
* -1: Failure to add component (refer to errno)
*/
-asn1p_wsyntx_chunk_t *asn1p_wsyntx_chunk_frombuf(char *buf, int len, int _copy);
+asn1p_wsyntx_chunk_t *asn1p_wsyntx_chunk_fromstring(char *token, int _copy);
asn1p_wsyntx_chunk_t *asn1p_wsyntx_chunk_fromsyntax(asn1p_wsyntx_t *syntax);
diff --git a/libasn1parser/asn1p_y.c b/libasn1parser/asn1p_y.c
index 138f976..f99d215 100644
--- a/libasn1parser/asn1p_y.c
+++ b/libasn1parser/asn1p_y.c
@@ -2785,7 +2785,7 @@
case 109:
#line 1125 "asn1p_y.y"
{
- yyval.a_wchunk = asn1p_wsyntx_chunk_frombuf(yyvsp[0].tv_opaque.buf, yyvsp[0].tv_opaque.len, 0);
+ yyval.a_wchunk = asn1p_wsyntx_chunk_fromstring(yyvsp[0].tv_opaque.buf, 0);
yyval.a_wchunk->type = WC_WHITESPACE;
}
break;
@@ -2793,14 +2793,14 @@
case 110:
#line 1129 "asn1p_y.y"
{
- yyval.a_wchunk = asn1p_wsyntx_chunk_frombuf(yyvsp[0].tv_str, strlen(yyvsp[0].tv_str), 0);
+ yyval.a_wchunk = asn1p_wsyntx_chunk_fromstring(yyvsp[0].tv_str, 0);
}
break;
case 111:
#line 1132 "asn1p_y.y"
{
- yyval.a_wchunk = asn1p_wsyntx_chunk_frombuf(yyvsp[0].a_refcomp.name, strlen(yyvsp[0].a_refcomp.name), 0);
+ yyval.a_wchunk = asn1p_wsyntx_chunk_fromstring(yyvsp[0].a_refcomp.name, 0);
yyval.a_wchunk->type = WC_FIELD;
}
break;
diff --git a/libasn1parser/asn1p_y.h b/libasn1parser/asn1p_y.h
index 14bc7b6..b7b7f1a 100644
--- a/libasn1parser/asn1p_y.h
+++ b/libasn1parser/asn1p_y.h
@@ -278,7 +278,7 @@
} tv_nametag;
} yystype;
/* Line 1281 of /usr/local/share/bison/yacc.c. */
-#line 282 "y.tab.h"
+#line 282 "asn1p_y.h"
# define YYSTYPE yystype
#endif
diff --git a/libasn1parser/asn1p_y.y b/libasn1parser/asn1p_y.y
index ce34cac..3589a8e 100644
--- a/libasn1parser/asn1p_y.y
+++ b/libasn1parser/asn1p_y.y
@@ -1123,14 +1123,14 @@
WithSyntaxToken:
TOK_whitespace {
- $$ = asn1p_wsyntx_chunk_frombuf($1.buf, $1.len, 0);
+ $$ = asn1p_wsyntx_chunk_fromstring($1.buf, 0);
$$->type = WC_WHITESPACE;
}
| TOK_Literal {
- $$ = asn1p_wsyntx_chunk_frombuf($1, strlen($1), 0);
+ $$ = asn1p_wsyntx_chunk_fromstring($1, 0);
}
| PrimitiveFieldReference {
- $$ = asn1p_wsyntx_chunk_frombuf($1.name, strlen($1.name), 0);
+ $$ = asn1p_wsyntx_chunk_fromstring($1.name, 0);
$$->type = WC_FIELD;
}
| '[' WithSyntaxList ']' {