sniper Mon Dec 5 20:08:42 2005 EDT
Modified files:
/php-src/sapi/cli php_cli.c
Log:
nuke php3 legacy
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.138&r2=1.139&ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.138 php-src/sapi/cli/php_cli.c:1.139
--- php-src/sapi/cli/php_cli.c:1.138 Thu Nov 17 18:20:39 2005
+++ php-src/sapi/cli/php_cli.c Mon Dec 5 20:08:40 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c,v 1.138 2005/11/17 23:20:39 helly Exp $ */
+/* $Id: php_cli.c,v 1.139 2005/12/06 01:08:40 sniper Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1117,7 +1117,7 @@
{
char *input;
size_t len, index = 0;
- pval *argn, *argi;
+ zval *argn, *argi;
cli_register_file_handles(TSRMLS_C);
@@ -1128,7 +1128,7 @@
Z_TYPE_P(argi) = IS_LONG;
Z_LVAL_P(argi) = index;
INIT_PZVAL(argi);
- zend_hash_update(&EG(symbol_table), "argi",
sizeof("argi"), &argi, sizeof(pval *), NULL);
+ zend_hash_update(&EG(symbol_table), "argi",
sizeof("argi"), &argi, sizeof(zval *), NULL);
while (exit_status == SUCCESS &&
(input=php_stream_gets(s_in_process, NULL, 0)) != NULL) {
len = strlen(input);
while (len-- && (input[len]=='\n' ||
input[len]=='\r')) {
@@ -1139,7 +1139,7 @@
Z_STRLEN_P(argn) = ++len;
Z_STRVAL_P(argn) = estrndup(input, len);
INIT_PZVAL(argn);
- zend_hash_update(&EG(symbol_table),
"argn", sizeof("argn"), &argn, sizeof(pval *), NULL);
+ zend_hash_update(&EG(symbol_table),
"argn", sizeof("argn"), &argn, sizeof(zval *), NULL);
Z_LVAL_P(argi) = ++index;
if (exec_run) {
if
(zend_eval_string_ex(exec_run, NULL, "Command line run code", 1 TSRMLS_CC) ==
FAILURE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
