cvs: /php4/ext/standard basic_functions.c
| From: | Stig Bakken | Date: | Tue, 09 Nov 1999 08:00:32 +0000 |
| Subject: | cvs: /php4/ext/standard basic_functions.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-5980@lists.php.net to get a copy of this message | ||
ssb Tue Nov 9 03:00:32 1999 EDT
Modified files:
/php4/ext/standard basic_functions.c
Log:
#Andrei: I left the convert_to_long() in there, it doesn't really make
#much of a difference.
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.118 php4/ext/standard/basic_functions.c:1.119
--- php4/ext/standard/basic_functions.c:1.118 Sat Nov 6 05:01:55 1999
+++ php4/ext/standard/basic_functions.c Tue Nov 9 02:59:50 1999
@@ -738,47 +738,28 @@
{
Bucket *f;
Bucket *s;
+ pval result;
pval *first;
pval *second;
- double dfirst, dsecond;
-
+
f = *((Bucket **) a);
s = *((Bucket **) b);
-
+
first = *((pval **) f->pData);
second = *((pval **) s->pData);
- if ((first->type == IS_LONG || first->type == IS_DOUBLE) &&
- (second->type == IS_LONG || second->type == IS_DOUBLE)) {
- if (first->type == IS_LONG) {
- dfirst = (double) first->value.lval;
- } else {
- dfirst = first->value.dval;
- }
- if (second->type == IS_LONG) {
- dsecond = (double) second->value.lval;
- } else {
- dsecond = second->value.dval;
- }
- if (dfirst < dsecond) {
- return -1;
- } else if (dfirst == dsecond) {
- return 0;
- } else {
- return 1;
- }
- }
- if ((first->type == IS_LONG || first->type == IS_DOUBLE) &&
- second->type == IS_STRING) {
+ if (compare_function(&result, first, second) == FAILURE) {
+ return 0;
+ }
+
+ convert_to_long(&result);
+ if (result.value.lval < 0) {
return -1;
- } else if ((first->type == IS_STRING) &&
- (second->type == IS_LONG || second->type == IS_DOUBLE)) {
+ } else if (result.value.lval > 0) {
return 1;
+ } else {
+ return 0;
}
- if (first->type == IS_STRING && second->type == IS_STRING) {
- return strcmp(first->value.str.val, second->value.str.val);
- }
- return 0; /* Anything else is equal as it can't be compared */
}
static int array_reverse_data_compare(const void *a, const void *b)