php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-09 17:13:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added DBX_CMP_TEXT and DBX_CMP_NUMBER constants and support for them in

Browse Source 
the dbx_cmp_desc and dbx_cmp_asc functions. The old method of passing a
string "number" is now no longer valid. (Mc)
This commit is contained in:
Marc Boeren
2001-04-18 12:31:08 +00:00
parent e85f4fd5a7
commit 9fc2c61698
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ext/dbx/dbx.c
View File

@@ -138,6 +138,8 @@ ZEND_MINIT_FUNCTION(dbx)
REGISTER_LONG_CONSTANT("DBX_RESULT_INFO", DBX_RESULT_INFO, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("DBX_RESULT_INDEX", DBX_RESULT_INDEX, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("DBX_RESULT_ASSOC", DBX_RESULT_ASSOC, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("DBX_CMP_TEXT", DBX_CMP_TEXT, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("DBX_CMP_NUMBER", DBX_CMP_NUMBER, CONST_CS | CONST_PERSISTENT);
return SUCCESS;
}
@@ -498,7 +500,7 @@ ZEND_FUNCTION(dbx_cmp_asc)
int min_number_of_arguments=3;
int max_number_of_arguments=4;
int number_of_arguments=-1;
int comparison_type=0;
long comparison_type;
double dtemp;
long ltemp;
zval ** arguments[4];
@@ -516,10 +518,10 @@ ZEND_FUNCTION(dbx_cmp_asc)
RETURN_LONG(0);
}
convert_to_string_ex(arguments[2]); /*/ field name /*/
comparison_type = 0; // default, text
comparison_type = DBX_CMP_TEXT;
if (number_of_arguments>3) {
convert_to_string_ex(arguments[3]); /*/ comparison type /*/
if (!strcmp((*arguments[3])->value.str.val, "number")) comparison_type=1;
convert_to_long_ex(arguments[3]); /*/ comparison type /*/
comparison_type=(*arguments[3])->value.lval;
}
if (zend_hash_find((*arguments[0])->value.ht, (*arguments[2])->value.str.val, (*arguments[2])->value.str.len+1, (void **) &zv_a)==FAILURE
@@ -529,13 +531,13 @@ ZEND_FUNCTION(dbx_cmp_asc)
}
switch (comparison_type) {
case 0:
case DBX_CMP_TEXT:
convert_to_string_ex(zv_a);
convert_to_string_ex(zv_b);
ltemp = strcmp((*zv_a)->value.str.val, (*zv_b)->value.str.val);
result = (ltemp==0?0: (ltemp>0?1:-1));
break;
case 1:
case DBX_CMP_NUMBER:
convert_to_double_ex(zv_a);
convert_to_double_ex(zv_b);
dtemp = ((*zv_a)->value.dval - (*zv_b)->value.dval);
@@ -557,7 +559,7 @@ ZEND_FUNCTION(dbx_cmp_desc)
int min_number_of_arguments=3;
int max_number_of_arguments=4;
int number_of_arguments=-1;
int comparison_type=0;
long comparison_type;
double dtemp;
long ltemp;
zval ** arguments[4];
@@ -575,10 +577,10 @@ ZEND_FUNCTION(dbx_cmp_desc)
RETURN_LONG(0);
}
convert_to_string_ex(arguments[2]); /*/ field name /*/
comparison_type = 0; // default, text
comparison_type = DBX_CMP_TEXT;
if (number_of_arguments>3) {
convert_to_string_ex(arguments[3]); /*/ comparison type /*/
if (!strcmp((*arguments[3])->value.str.val, "number")) comparison_type=1;
convert_to_long_ex(arguments[3]); /*/ comparison type /*/
comparison_type=(*arguments[3])->value.lval;
}
if (zend_hash_find((*arguments[0])->value.ht, (*arguments[2])->value.str.val, (*arguments[2])->value.str.len+1, (void **) &zv_a)==FAILURE
@@ -588,13 +590,13 @@ ZEND_FUNCTION(dbx_cmp_desc)
}
switch (comparison_type) {
case 0:
case DBX_CMP_TEXT:
convert_to_string_ex(zv_a);
convert_to_string_ex(zv_b);
ltemp = strcmp((*zv_b)->value.str.val, (*zv_a)->value.str.val);
result = (ltemp==0?0: (ltemp>0?1:-1));
break;
case 1:
case DBX_CMP_NUMBER:
convert_to_double_ex(zv_a);
convert_to_double_ex(zv_b);
dtemp = ((*zv_b)->value.dval - (*zv_a)->value.dval);

2
ext/dbx/dbx.h
View File

@@ -33,6 +33,8 @@
#define DBX_RESULT_INFO 1
#define DBX_RESULT_INDEX 2
#define DBX_RESULT_ASSOC 4
#define DBX_CMP_TEXT 0
#define DBX_CMP_NUMBER 1
#define MOVE_RETURNED_TO_RV(rv, returned_zval) { **rv = *returned_zval; zval_copy_ctor(*rv); zval_ptr_dtor(&returned_zval); }