com php-src: use a portable strndup implementation: phpdbg_lexer.c phpdbg_lexer.l
| From: | Anatol Belski | Date: | Thu, 24 Apr 2014 09:01:54 +0000 |
| Subject: | com php-src: use a portable strndup implementation: phpdbg_lexer.c phpdbg_lexer.l | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77127@lists.php.net to get a copy of this message | ||
Commit: 3e6a3874541bb63604636440ffd5f00e47107f52
Author: Anatol Belski <ab@php.net> Thu, 24 Apr 2014 11:01:54 +0200
Parents: 165994043a470cc3ba0723660e0ba39cba5bb149
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3e6a3874541bb63604636440ffd5f00e47107f52
Log:
use a portable strndup implementation
Changed paths:
M phpdbg_lexer.c
M phpdbg_lexer.l
Diff:
diff --git a/phpdbg_lexer.c b/phpdbg_lexer.c
index c289004..94a4ba9 100644
--- a/phpdbg_lexer.c
+++ b/phpdbg_lexer.c
@@ -1026,7 +1026,7 @@ YY_RULE_SETUP
#line 78 "/usr/src/php-src/sapi/phpdbg/phpdbg_lexer.l"
{
phpdbg_init_param(yylval, STR_PARAM);
- yylval->str = strndup(yytext, yyleng);
+ yylval->str = zend_strndup(yytext, yyleng);
yylval->len = yyleng;
return T_PROTO;
}
@@ -1087,7 +1087,7 @@ YY_RULE_SETUP
#line 108 "/usr/src/php-src/sapi/phpdbg/phpdbg_lexer.l"
{
phpdbg_init_param(yylval, OP_PARAM);
- yylval->str = strndup(yytext, yyleng);
+ yylval->str = zend_strndup(yytext, yyleng);
yylval->len = yyleng;
return T_OPCODE;
}
@@ -1097,7 +1097,7 @@ YY_RULE_SETUP
#line 114 "/usr/src/php-src/sapi/phpdbg/phpdbg_lexer.l"
{
phpdbg_init_param(yylval, STR_PARAM);
- yylval->str = strndup(yytext, yyleng);
+ yylval->str = zend_strndup(yytext, yyleng);
yylval->len = yyleng;
return T_ID;
}
@@ -1108,7 +1108,7 @@ YY_RULE_SETUP
#line 122 "/usr/src/php-src/sapi/phpdbg/phpdbg_lexer.l"
{
phpdbg_init_param(yylval, STR_PARAM);
- yylval->str = strndup(yytext, yyleng);
+ yylval->str = zend_strndup(yytext, yyleng);
yylval->len = yyleng;
BEGIN(INITIAL);
return T_INPUT;
diff --git a/phpdbg_lexer.l b/phpdbg_lexer.l
index ad5edd9..b3536fe 100644
--- a/phpdbg_lexer.l
+++ b/phpdbg_lexer.l
@@ -77,7 +77,7 @@ INPUT [^\n]+
<INITIAL,NORMAL>{
{ID}[:]{1}[//]{2} {
phpdbg_init_param(yylval, STR_PARAM);
- yylval->str = strndup(yytext, yyleng);
+ yylval->str = zend_strndup(yytext, yyleng);
yylval->len = yyleng;
return T_PROTO;
}
@@ -107,13 +107,13 @@ INPUT [^\n]+
}
{OPCODE} {
phpdbg_init_param(yylval, OP_PARAM);
- yylval->str = strndup(yytext, yyleng);
+ yylval->str = zend_strndup(yytext, yyleng);
yylval->len = yyleng;
return T_OPCODE;
}
{ID} {
phpdbg_init_param(yylval, STR_PARAM);
- yylval->str = strndup(yytext, yyleng);
+ yylval->str = zend_strndup(yytext, yyleng);
yylval->len = yyleng;
return T_ID;
}
@@ -121,7 +121,7 @@ INPUT [^\n]+
<RAW>{INPUT} {
phpdbg_init_param(yylval, STR_PARAM);
- yylval->str = strndup(yytext, yyleng);
+ yylval->str = zend_strndup(yytext, yyleng);
yylval->len = yyleng;
BEGIN(INITIAL);
return T_INPUT;