cvs: php4 /ext/standard string.c
| From: | Andrei Zmievski | Date: | Mon, 11 Sep 2000 14:54:13 +0000 |
| Subject: | cvs: php4 /ext/standard string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1700@lists.php.net to get a copy of this message | ||
andrei Mon Sep 11 07:54:13 2000 EDT
Modified files:
/php4/ext/standard string.c
Log:
(PHP parse_str) ParameterPassedByReference() check is not necessary.
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.151 php4/ext/standard/string.c:1.152
--- php4/ext/standard/string.c:1.151 Mon Sep 11 07:50:26 2000
+++ php4/ext/standard/string.c Mon Sep 11 07:54:12 2000
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.151 2000/09/11 14:50:26 stas Exp $ */
+/* $Id: string.c,v 1.152 2000/09/11 14:54:12 andrei Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -775,11 +775,6 @@
}
}
- if (opt == PHP_PATHINFO_DIRNAME || argc < 2) {
- ret = php_basename(Z_STRVAL_PP(str), len);
- add_assoc_string(tmp, "dirname", ret, 1);
- }
-
if (argc == 2) {
zval **element;
zend_hash_get_current_data(Z_ARRVAL_P(tmp), (void **)&element);
@@ -2430,11 +2425,6 @@
php_treat_data(PARSE_STRING, res, NULL ELS_CC PLS_CC SLS_CC);
else
{
- if(!ParameterPassedByReference(ht, 2)){
- php_error(E_WARNING, "Array not passed by reference in call to parse_str()");
- return;
- }
-
/* Clear out the array that was passed in. */
zval_dtor(*arrayArg);
array_init(*arrayArg);