diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-02-13 22:20:39 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-02-13 22:20:39 +0300 |
| commit | e10e151e9b92313a7085272c85bebf6c82017fce (patch) | |
| tree | 6cac4100536c5e25143c55d1ab6b2f3b3dc81cf9 /sapi/cli/php_cli.c | |
| parent | bc630ad6da0c6d7cf2d224dba8972499d5691c6b (diff) | |
| download | php-git-e10e151e9b92313a7085272c85bebf6c82017fce.tar.gz | |
Merged zend_array and HashTable into the single data structure.
Now each HashTable is also zend_array, so it's refcounted and may be a subject for Copy on Write
zend_array_dup() was changed to allocate and return HashTable, instead of taking preallocated HashTable as argument.
Diffstat (limited to 'sapi/cli/php_cli.c')
| -rw-r--r-- | sapi/cli/php_cli.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 81eba9a83a..e92d95d694 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -1033,14 +1033,14 @@ static int do_cli(int argc, char **argv) /* {{{ */ exit_status=254; } ZVAL_LONG(&argi, index); - zend_hash_str_update(&EG(symbol_table).ht, "argi", sizeof("argi")-1, &argi); + zend_hash_str_update(&EG(symbol_table), "argi", sizeof("argi")-1, &argi); while (exit_status == SUCCESS && (input=php_stream_gets(s_in_process, NULL, 0)) != NULL) { len = strlen(input); while (len > 0 && len-- && (input[len]=='\n' || input[len]=='\r')) { input[len] = '\0'; } ZVAL_STRINGL(&argn, input, len); - zend_hash_str_update(&EG(symbol_table).ht, "argn", sizeof("argn")-1, &argn); + zend_hash_str_update(&EG(symbol_table), "argn", sizeof("argn")-1, &argn); Z_LVAL(argi) = ++index; if (exec_run) { if (zend_eval_string_ex(exec_run, NULL, "Command line run code", 1) == FAILURE) { |