Re: cvs: php-src /ext/standard exec.c
| From: | Felipe Pena | Date: | Thu, 16 Oct 2008 13:02:53 +0000 |
| Subject: | Re: cvs: php-src /ext/standard exec.c | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-53544@lists.php.net to get a copy of this message | ||
Hi Alexey,
Em Qui, 2008-10-16 às 12:21 +0000, Alexey Zakhlestin escreveu:
> indeyets Thu Oct 16 12:21:27 2008 UTC
>
> Modified files:
> /php-src/ext/standard exec.c
> Log:
> MFB: Fixed compilation warnings: tsrm_ls is not used here (anymore?)
>
It is used in somes cases. The php_escape_shell_arg and
php_escape_shell_cmd uses php_mblen():
#ifndef HAVE_MBLEN
# define php_mblen(ptr, len) 1
#else
# if defined(_REENTRANT) && defined(HAVE_MBRLEN) &&
defined(HAVE_MBSTATE_T)
# define php_mblen(ptr, len) ((ptr) == NULL ?
mbsinit(&BG(mblen_state)): (int)mbrlen(ptr, len, &BG(mblen_state)))
# else
# define php_mblen(ptr, len) mblen(ptr, len)
# endif
#endif
>
> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.136&r2=1.137&diff_format=u
> Index: php-src/ext/standard/exec.c
> diff -u php-src/ext/standard/exec.c:1.136 php-src/ext/standard/exec.c:1.137
> --- php-src/ext/standard/exec.c:1.136 Sun Aug 17 15:23:22 2008
> +++ php-src/ext/standard/exec.c Thu Oct 16 12:21:27 2008
> @@ -16,7 +16,7 @@
> | Ilia Alshanetsky <iliaa@php.net> |
> +----------------------------------------------------------------------+
> */
> -/* $Id: exec.c,v 1.136 2008/08/17 15:23:22 pajoye Exp $ */
> +/* $Id: exec.c,v 1.137 2008/10/16 12:21:27 indeyets Exp $ */
>
> #include <stdio.h>
> #include "php.h"
> @@ -253,8 +253,6 @@
> char *cmd;
> char *p = NULL;
> size_t estimate = (2 * l) + 1;
> -
> - TSRMLS_FETCH();
>
> cmd = safe_emalloc(2, l, 1);
>
> @@ -343,7 +341,6 @@
> int x, y = 0, l = strlen(str);
> char *cmd;
> size_t estimate = (4 * l) + 3;
> - TSRMLS_FETCH();
>
> cmd = safe_emalloc(4, l, 3); /* worst case */
>
>
>
>
--
Regards,
Felipe Pena