cvs: /php4/ext/standard basic_functions.c
| From: | Andrei Zmievski | Date: | Mon, 11 Oct 1999 21:43:12 +0000 |
| Subject: | cvs: /php4/ext/standard basic_functions.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-5486@lists.php.net to get a copy of this message | ||
andrei Mon Oct 11 17:43:12 1999 EDT
Modified files:
/php4/ext/standard basic_functions.c
Log:
Modified sorting functions to use updated zend_hash() prototype.
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.99 php4/ext/standard/basic_functions.c:1.100
--- php4/ext/standard/basic_functions.c:1.99 Thu Oct 7 22:10:55 1999
+++ php4/ext/standard/basic_functions.c Mon Oct 11 17:42:42 1999
@@ -678,7 +678,7 @@
php_error(E_WARNING, "Wrong datatype in krsort() call");
return;
}
- if (zend_hash_sort(target_hash, array_reverse_key_compare,0) == FAILURE) {
+ if (zend_hash_sort(target_hash, qsort, array_reverse_key_compare, 0) == FAILURE) {
return;
}
RETURN_TRUE;
@@ -697,7 +697,7 @@
php_error(E_WARNING, "Wrong datatype in ksort() call");
return;
}
- if (zend_hash_sort(target_hash, array_key_compare,0) == FAILURE) {
+ if (zend_hash_sort(target_hash, qsort, array_key_compare,0) == FAILURE) {
return;
}
RETURN_TRUE;
@@ -794,7 +794,7 @@
php_error(E_WARNING, "Wrong datatype in asort() call");
return;
}
- if (zend_hash_sort(target_hash, array_data_compare,0) == FAILURE) {
+ if (zend_hash_sort(target_hash, qsort, array_data_compare,0) == FAILURE) {
return;
}
RETURN_TRUE;
@@ -813,7 +813,7 @@
php_error(E_WARNING, "Wrong datatype in arsort() call");
return;
}
- if (zend_hash_sort(target_hash, array_reverse_data_compare,0) == FAILURE) {
+ if (zend_hash_sort(target_hash, qsort, array_reverse_data_compare,0) == FAILURE) {
return;
}
RETURN_TRUE;
@@ -832,7 +832,7 @@
php_error(E_WARNING, "Wrong datatype in sort() call");
return;
}
- if (zend_hash_sort(target_hash, array_data_compare,1) == FAILURE) {
+ if (zend_hash_sort(target_hash, qsort, array_data_compare,1) == FAILURE) {
return;
}
RETURN_TRUE;
@@ -851,7 +851,7 @@
php_error(E_WARNING, "Wrong datatype in rsort() call");
return;
}
- if (zend_hash_sort(target_hash, array_reverse_data_compare,1) == FAILURE) {
+ if (zend_hash_sort(target_hash, qsort, array_reverse_data_compare,1) == FAILURE) {
return;
}
RETURN_TRUE;
@@ -899,7 +899,7 @@
return;
}
convert_to_string_ex(user_compare_func_name);
- if (zend_hash_sort(target_hash, array_user_compare, 1) == FAILURE) {
+ if (zend_hash_sort(target_hash, qsort, array_user_compare, 1) == FAILURE) {
user_compare_func_name = old_compare_func;
return;
}
@@ -925,7 +925,7 @@
return;
}
convert_to_string_ex(user_compare_func_name);
- if (zend_hash_sort(target_hash, array_user_compare, 0) == FAILURE) {
+ if (zend_hash_sort(target_hash, qsort, array_user_compare, 0) == FAILURE) {
user_compare_func_name = old_compare_func;
return;
}
@@ -1001,7 +1001,7 @@
return;
}
convert_to_string_ex(user_compare_func_name);
- if (zend_hash_sort(target_hash, array_user_key_compare, 0) == FAILURE) {
+ if (zend_hash_sort(target_hash, qsort, array_user_key_compare, 0) == FAILURE) {
user_compare_func_name = old_compare_func;
return;
}
@@ -2445,7 +2445,7 @@
php_error(E_WARNING, "Wrong datatype in shuffle() call");
return;
}
- if (zend_hash_sort((*array)->value.ht, array_data_shuffle, 1) == FAILURE) {
+ if (zend_hash_sort((*array)->value.ht, qsort, array_data_shuffle, 1) == FAILURE) {
return;
}
RETURN_TRUE;