summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Zmievski <andrei@php.net>2001-06-01 15:01:29 +0000
committerAndrei Zmievski <andrei@php.net>2001-06-01 15:01:29 +0000
commit171c425641f3d28aeb2a387258f5d1a3ebe93836 (patch)
treef5e761d200661980a30d3480de2ce7481c80249d
parentf2002d3e41b42fccd53ce93a7b027fb7ca5edeb5 (diff)
downloadphp-git-171c425641f3d28aeb2a387258f5d1a3ebe93836.tar.gz
A little clean, merge two if statements.
-rw-r--r--main/main.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/main/main.c b/main/main.c
index c6828c806d..a444cbf2c2 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1125,14 +1125,12 @@ static void php_build_argv(char *s, zval *track_vars_array ELS_DC PLS_DC)
INIT_PZVAL(argc);
if (PG(register_globals)) {
+ arr->refcount++;
+ argc->refcount++;
zend_hash_update(&EG(symbol_table), "argv", sizeof("argv"), &arr, sizeof(zval *), NULL);
zend_hash_add(&EG(symbol_table), "argc", sizeof("argc"), &argc, sizeof(zval *), NULL);
}
- if (PG(register_globals)) {
- arr->refcount++;
- argc->refcount++;
- }
zend_hash_update(track_vars_array->value.ht, "argv", sizeof("argv"), &arr, sizeof(pval *), NULL);
zend_hash_update(track_vars_array->value.ht, "argc", sizeof("argc"), &argc, sizeof(pval *), NULL);
}