tony2001 Tue Jul 1 08:19:53 2008 UTC
Modified files:
/php-src/ext/unicode property.c
Log:
misc parse_parameters fixes
http://cvs.php.net/viewvc.cgi/php-src/ext/unicode/property.c?r1=1.18&r2=1.19&diff_format=u
Index: php-src/ext/unicode/property.c
diff -u php-src/ext/unicode/property.c:1.18 php-src/ext/unicode/property.c:1.19
--- php-src/ext/unicode/property.c:1.18 Mon Jan 1 09:29:33 2007
+++ php-src/ext/unicode/property.c Tue Jul 1 08:19:53 2008
@@ -14,7 +14,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: property.c,v 1.18 2007/01/01 09:29:33 sebastian Exp $ */
+/* $Id: property.c,v 1.19 2008/07/01 08:19:53 tony2001 Exp $ */
#include "php_unicode.h"
@@ -303,8 +303,8 @@
{
UChar *str;
int str_len;
- int radix = 0;
int offset = 0;
+ long radix = 0;
UChar32 ch;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "u|l", &str,
&str_len, &radix) == FAILURE) {
@@ -447,8 +447,8 @@
Get the character representation for the specified digit (optionally in the
specified radix) */
PHP_FUNCTION(char_from_digit)
{
- int digit;
- int radix = 10;
+ long digit;
+ long radix = 10;
UChar32 ch;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|l", &digit,
&radix) == FAILURE) {
@@ -852,19 +852,19 @@
return result;
}
-/* {{{ proto bool char_enum_names(callback Callback, int start, int limit[,
int extended = false]) U
+/* {{{ proto bool char_enum_names(callback Callback, int start, int limit[,
bool extended = false]) U
Enumerate all assigned Unicode characters between the start and limit code
points (start inclusive, limit exclusive) and call a function for each, passing
the code point value and the character name. */
PHP_FUNCTION(char_enum_names)
{
- zval *callback;
- long start, limit;
+ zval *callback;
+ long start, limit;
zend_bool extended = FALSE;
- zval *zcode, *zname, *zextended;
- char_enum_context_t ectx;
+ zval *zcode, *zname, *zextended;
+ char_enum_context_t ectx;
UCharNameChoice choice = U_UNICODE_CHAR_NAME;
- UErrorCode status = U_ZERO_ERROR;
+ UErrorCode status = U_ZERO_ERROR;
- if (zend_parse_parameters(ZEND_NUM_ARGS()TSRMLS_CC, "zll|l", &callback,
&start, &limit, &extended)) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS()TSRMLS_CC, "zll|b", &callback,
&start, &limit, &extended)) {
return;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
