andrei Wed Jun 15 17:20:28 2005 EDT
Modified files:
/php-src/ext/standard array.c
Log:
WS fix
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.301&r2=1.302&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.301 php-src/ext/standard/array.c:1.302
--- php-src/ext/standard/array.c:1.301 Wed Jun 15 16:51:33 2005
+++ php-src/ext/standard/array.c Wed Jun 15 17:20:26 2005
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.301 2005/06/15 20:51:33 andrei Exp $ */
+/* $Id: array.c,v 1.302 2005/06/15 21:20:26 andrei Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -647,29 +647,29 @@
{
zval **array;
HashTable *target_hash;
- PHP_ARRAY_CMP_FUNC_VARS;
+ PHP_ARRAY_CMP_FUNC_VARS;
PHP_ARRAY_CMP_FUNC_BACKUP();
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &array,
&BG(user_compare_func_name)) == FAILURE) {
- PHP_ARRAY_CMP_FUNC_RESTORE();
+ PHP_ARRAY_CMP_FUNC_RESTORE();
WRONG_PARAM_COUNT;
}
target_hash = HASH_OF(*array);
if (!target_hash) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "The argument
should be an array");
- PHP_ARRAY_CMP_FUNC_RESTORE();
+ PHP_ARRAY_CMP_FUNC_RESTORE();
RETURN_FALSE;
}
PHP_ARRAY_CMP_FUNC_CHECK(BG(user_compare_func_name))
if (zend_hash_sort(target_hash, zend_qsort, array_user_compare, 1
TSRMLS_CC) == FAILURE) {
- PHP_ARRAY_CMP_FUNC_RESTORE();
+ PHP_ARRAY_CMP_FUNC_RESTORE();
RETURN_FALSE;
}
- PHP_ARRAY_CMP_FUNC_RESTORE();
+ PHP_ARRAY_CMP_FUNC_RESTORE();
RETURN_TRUE;
}
/* }}} */
@@ -680,28 +680,28 @@
{
zval **array;
HashTable *target_hash;
- PHP_ARRAY_CMP_FUNC_VARS;
+ PHP_ARRAY_CMP_FUNC_VARS;
PHP_ARRAY_CMP_FUNC_BACKUP();
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &array,
&BG(user_compare_func_name)) == FAILURE) {
- PHP_ARRAY_CMP_FUNC_RESTORE();
+ PHP_ARRAY_CMP_FUNC_RESTORE();
WRONG_PARAM_COUNT;
}
target_hash = HASH_OF(*array);
if (!target_hash) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "The argument
should be an array");
- PHP_ARRAY_CMP_FUNC_RESTORE();
+ PHP_ARRAY_CMP_FUNC_RESTORE();
RETURN_FALSE;
}
PHP_ARRAY_CMP_FUNC_CHECK(BG(user_compare_func_name))
if (zend_hash_sort(target_hash, zend_qsort, array_user_compare, 0
TSRMLS_CC) == FAILURE) {
- PHP_ARRAY_CMP_FUNC_RESTORE();
+ PHP_ARRAY_CMP_FUNC_RESTORE();
RETURN_FALSE;
}
- PHP_ARRAY_CMP_FUNC_RESTORE();
+ PHP_ARRAY_CMP_FUNC_RESTORE();
RETURN_TRUE;
}
@@ -760,19 +760,19 @@
{
zval **array;
HashTable *target_hash;
- PHP_ARRAY_CMP_FUNC_VARS;
+ PHP_ARRAY_CMP_FUNC_VARS;
- PHP_ARRAY_CMP_FUNC_BACKUP();
+ PHP_ARRAY_CMP_FUNC_BACKUP();
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &array,
&BG(user_compare_func_name)) == FAILURE) {
- PHP_ARRAY_CMP_FUNC_RESTORE();
+ PHP_ARRAY_CMP_FUNC_RESTORE();
WRONG_PARAM_COUNT;
}
target_hash = HASH_OF(*array);
if (!target_hash) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "The argument
should be an array");
- PHP_ARRAY_CMP_FUNC_RESTORE();
+ PHP_ARRAY_CMP_FUNC_RESTORE();
RETURN_FALSE;
}
@@ -780,12 +780,12 @@
PHP_ARRAY_CMP_FUNC_CHECK(BG(user_compare_func_name))
if (zend_hash_sort(target_hash, zend_qsort, array_user_key_compare, 0
TSRMLS_CC) == FAILURE) {
- PHP_ARRAY_CMP_FUNC_RESTORE();
+ PHP_ARRAY_CMP_FUNC_RESTORE();
RETURN_FALSE;
}
- PHP_ARRAY_CMP_FUNC_RESTORE();
+ PHP_ARRAY_CMP_FUNC_RESTORE();
RETURN_TRUE;
}
/* }}} */
@@ -2858,7 +2858,7 @@
Bucket ***lists, **list, ***ptrs, *p;
char *callback_name;
- PHP_ARRAY_CMP_FUNC_VARS;
+ PHP_ARRAY_CMP_FUNC_VARS;
int (*intersect_key_compare_func)(const void *, const void * TSRMLS_DC);
@@ -2873,7 +2873,7 @@
WRONG_PARAM_COUNT;
}
- PHP_ARRAY_CMP_FUNC_BACKUP();
+ PHP_ARRAY_CMP_FUNC_BACKUP();
if (behavior == INTERSECT_NORMAL) {
intersect_key_compare_func = array_key_compare;
@@ -3144,7 +3144,7 @@
pefree(lists[i], hash->persistent);
}
- PHP_ARRAY_CMP_FUNC_RESTORE();
+ PHP_ARRAY_CMP_FUNC_RESTORE();
efree(ptrs);
@@ -3234,7 +3234,7 @@
Bucket ***lists, **list, ***ptrs, *p;
char *callback_name;
- PHP_ARRAY_CMP_FUNC_VARS;
+ PHP_ARRAY_CMP_FUNC_VARS;
int (*diff_key_compare_func)(const void *, const void * TSRMLS_DC);
int (*diff_data_compare_func)(const void *, const void * TSRMLS_DC);
@@ -3249,7 +3249,7 @@
WRONG_PARAM_COUNT;
}
- PHP_ARRAY_CMP_FUNC_BACKUP();
+ PHP_ARRAY_CMP_FUNC_BACKUP();
if (behavior == DIFF_NORMAL) {
diff_key_compare_func = array_key_compare;
@@ -3518,7 +3518,7 @@
pefree(lists[i], hash->persistent);
}
- PHP_ARRAY_CMP_FUNC_RESTORE();
+ PHP_ARRAY_CMP_FUNC_RESTORE();
efree(ptrs);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
