[PHP4BETA] CVS update: php4/ext/standard

Date: Monday April 26, 1999 @ 16:20 Author: zeev Update of /repository/php4/ext/standard In directory php:/tmp/cvs-serv18130/ext/standard Modified Files: basic_functions.c Log Message: * Small startup fix * Fix min() and max() Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.9 php4/ext/standard/basic_functions.c:1.10 --- php4/ext/standard/basic_functions.c:1.9 Mon Apr 26 13:26:36 1999 +++ php4/ext/standard/basic_functions.c Mon Apr 26 16:20:12 1999 @@ -1309,10 +1309,28 @@ var_uninit(return_value); } } else { - if (_php3_hash_minmax(ht, array_data_compare, 0, (void **) &result)==SUCCESS) { - *return_value = **result; - pval_copy_constructor(return_value); + pval **args = (pval **) emalloc(sizeof(pval *)*ARG_COUNT(ht)); + pval *min, result; + int i; + + if (getParametersArray(ht, ARG_COUNT(ht), args)==FAILURE) { + efree(args); + WRONG_PARAM_COUNT; + } + + min = args[0]; + + for (i=1; i<ARG_COUNT(ht); i++) { + compare_function(&result, min, args[i]); + if (result.value.lval > 0) { + min = args[i]; + } } + + *return_value = *min; + pval_copy_constructor(return_value); + + efree(args); } } @@ -1342,10 +1360,28 @@ var_uninit(return_value); } } else { - if (_php3_hash_minmax(ht, array_data_compare, 1, (void **) &result)==SUCCESS) { - *return_value = **result; - pval_copy_constructor(return_value); + pval **args = (pval **) emalloc(sizeof(pval *)*ARG_COUNT(ht)); + pval *max, result; + int i; + + if (getParametersArray(ht, ARG_COUNT(ht), args)==FAILURE) { + efree(args); + WRONG_PARAM_COUNT; + } + + max = args[0]; + + for (i=1; i<ARG_COUNT(ht); i++) { + compare_function(&result, max, args[i]); + if (result.value.lval < 0) { + max = args[i]; + } } + + *return_value = *max; + pval_copy_constructor(return_value); + + efree(args); } } @@ -1916,7 +1952,7 @@ pval_destructor(&overloaded_property->element); } - printf("%d arguments\n", zend_hash_num_elements(ht)); + printf("%d arguments\n", ARG_COUNT(ht)); return_value->value.str.val = estrndup("testing", 7); return_value->value.str.len = 7; return_value->type = IS_STRING; -- PHP 4 Beta