jani Thu, 16 Jul 2009 16:11:50 +0000
URL: http://svn.php.net/viewvc?view=revision&revision=284196
Changed paths:
D php/php-src/trunk/ext/intl/formatter/formatter_main.c.orig
Log:
- remove accidental commit (?)
Deleted: php/php-src/trunk/ext/intl/formatter/formatter_main.c.orig
===================================================================
--- php/php-src/trunk/ext/intl/formatter/formatter_main.c.orig 2009-07-16
16:09:18 UTC (rev 284195)
+++ php/php-src/trunk/ext/intl/formatter/formatter_main.c.orig 2009-07-16
16:11:50 UTC (rev 284196)
@@ -1,180 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 5 |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | lice...@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Authors: Stanislav Malyshev <s...@zend.com> |
- +----------------------------------------------------------------------+
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <unicode/ustring.h>
-
-#include "php_intl.h"
-#include "formatter_class.h"
-
-/* {{{ proto NumberFormatter NumberFormatter::create( string $locale, int
style[, string $pattern ] )
- * Create formatter. }}} */
-/* {{{ proto NumberFormatter numfmt_create( string $locale, int style[, string
$pattern ] )
- * Create formatter.
- */
-PHP_FUNCTION( numfmt_create )
-{
- char* locale;
- UChar* pattern = NULL;
- int locale_len = 0, style, pattern_len = 0;
- FORMATTER_METHOD_INIT_VARS;
-
- // Parse parameters.
- if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "sl|u",
- &locale, &locale_len, &style, &pattern, &pattern_len ) ==
FAILURE )
- {
- intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
- "numfmt_create: unable to parse input parameters", 0
TSRMLS_CC );
-
- RETURN_NULL();
- }
-
- INTL_CHECK_LOCALE_LEN(locale_len);
- // Create a NumberFormatter object and save the ICU formatter into it.
- if( ( object = getThis() ) == NULL )
- object = return_value;
-
- if( Z_TYPE_P( object ) != IS_OBJECT )
- object_init_ex( object, NumberFormatter_ce_ptr );
-
- FORMATTER_METHOD_FETCH_OBJECT;
-
- if(locale_len == 0) {
- locale = UG(default_locale);
- }
-
- FORMATTER_OBJECT(nfo) = unum_open(style, pattern, pattern_len, locale,
NULL, &INTL_DATA_ERROR_CODE(nfo));
-
- if( U_FAILURE( INTL_DATA_ERROR_CODE((nfo)) ) )
- {
- intl_error_set( NULL, INTL_DATA_ERROR_CODE( nfo ),
- "numfmt_create: number formatter creation failed", 0
TSRMLS_CC );
- zval_dtor(return_value);
- RETURN_NULL();
- }
-}
-/* }}} */
-
-/* {{{ proto void NumberFormatter::__construct( string $locale, int style[,
string $pattern ] )
- * NumberFormatter object constructor.
- */
-PHP_METHOD( NumberFormatter, __construct )
-{
- char* locale;
- UChar* pattern = NULL;
- int locale_len = 0, style, pattern_len = 0;
- FORMATTER_METHOD_INIT_VARS;
-
- object = getThis();
-
- // Parse parameters.
- if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "sl|u",
- &locale, &locale_len, &style, &pattern, &pattern_len ) ==
FAILURE )
- {
- intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
- "__construct: unable to parse input params", 0
TSRMLS_CC );
- zval_dtor(object);
- ZVAL_NULL(object);
- RETURN_NULL();
- }
-
- INTL_CHECK_LOCALE_LEN(locale_len);
- FORMATTER_METHOD_FETCH_OBJECT;
-
- if(locale_len == 0) {
- locale = UG(default_locale);
- }
-
- // Create an ICU number formatter.
- FORMATTER_OBJECT(nfo) = unum_open(style, pattern, pattern_len, locale,
NULL, &INTL_DATA_ERROR_CODE(nfo));
-
- if( U_FAILURE( INTL_DATA_ERROR_CODE((nfo)) ) )
- {
- intl_error_set( NULL, INTL_DATA_ERROR_CODE( nfo ),
- "__construct: number formatter creation failed", 0
TSRMLS_CC );
- zval_dtor(object);
- ZVAL_NULL(object);
- RETURN_NULL();
- }
-}
-/* }}} */
-
-/* {{{ proto int NumberFormatter::getErrorCode()
- * Get formatter's last error code. }}} */
-/* {{{ proto int numfmt_get_error_code( NumberFormatter $nf )
- * Get formatter's last error code.
- */
-PHP_FUNCTION( numfmt_get_error_code )
-{
- FORMATTER_METHOD_INIT_VARS;
-
- // Parse parameters.
- if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"O",
- &object, NumberFormatter_ce_ptr ) == FAILURE )
- {
- intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
- "numfmt_get_error_code: unable to parse input params",
0 TSRMLS_CC );
-
- RETURN_FALSE;
- }
-
- nfo = (NumberFormatter_object *) zend_object_store_get_object( object
TSRMLS_CC );
-
- // Return formatter's last error code.
- RETURN_LONG( INTL_DATA_ERROR_CODE(nfo) );
-}
-/* }}} */
-
-/* {{{ proto string NumberFormatter::getErrorMessage( )
- * Get text description for formatter's last error code. }}} */
-/* {{{ proto string numfmt_get_error_message( NumberFormatter $nf )
- * Get text description for formatter's last error code.
- */
-PHP_FUNCTION( numfmt_get_error_message )
-{
- char* message = NULL;
- FORMATTER_METHOD_INIT_VARS
-
- // Parse parameters.
- if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"O",
- &object, NumberFormatter_ce_ptr ) == FAILURE )
- {
- intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
- "numfmt_get_error_message: unable to parse input
params", 0 TSRMLS_CC );
-
- RETURN_FALSE;
- }
-
- // Create an ICU number formatter.
- nfo = (NumberFormatter_object *) zend_object_store_get_object( object
TSRMLS_CC );
-
- // Return last error message.
- message = intl_error_get_message( &INTL_DATA_ERROR(nfo) TSRMLS_CC );
- RETURN_STRING( message, 0);
-}
-/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: noet sw=4 ts=4 fdm=marker
- * vim<600: noet sw=4 ts=4
- */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
