com php-src: Fixed indentation. Fixed comment style. Fixed commented out code.: ext/intl/converter/converter.c ext/intl/dateformat/datef
ormat_create.cpp ext/spl/spl_fixedarray.c

From: Date: Mon, 16 Mar 2015 23:14:56 +0000
Subject: com php-src: Fixed indentation. Fixed comment style. Fixed commented out code.: ext/intl/converter/converter.c ext/intl/dateformat/datef
ormat_create.cpp ext/spl/spl_fixedarray.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85996@lists.php.net to get a copy of this message
Commit: 910a3243063f0490a60e5c3c0e1467a6171f4e39 Author: Danack <Danack@basereality.com> Mon, 16 Mar 2015 23:14:56 +0000 Parents: 6b232643e5c3b8f20a968e040b7c75695608a15b Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=910a3243063f0490a60e5c3c0e1467a6171f4e39 Log: Fixed indentation. Fixed comment style. Fixed commented out code. Changed paths: M ext/intl/converter/converter.c M ext/intl/dateformat/dateformat_create.cpp M ext/spl/spl_fixedarray.c Diff: diff --git a/ext/intl/converter/converter.c b/ext/intl/converter/converter.c index 3b830bd..760d763 100644 --- a/ext/intl/converter/converter.c +++ b/ext/intl/converter/converter.c @@ -563,9 +563,9 @@ static PHP_METHOD(UConverter, __construct) { intl_error_reset(NULL); zend_replace_error_handling(EH_THROW, IntlException_ce_ptr, &zeh TSRMLS_CC); - rv = zend_parse_parameters(ZEND_NUM_ARGS(), "|s!s!", + rv = zend_parse_parameters(ZEND_NUM_ARGS(), "|s!s!", &dest, &dest_len, &src, &src_len); - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_restore_error_handling(&zeh TSRMLS_CC); if (rv == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, diff --git a/ext/intl/dateformat/dateformat_create.cpp b/ext/intl/dateformat/dateformat_create.cpp index 9d6d5f4..31fcaeb 100644 --- a/ext/intl/dateformat/dateformat_create.cpp +++ b/ext/intl/dateformat/dateformat_create.cpp @@ -79,8 +79,8 @@ static void datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_constructor) DATE_FORMAT_METHOD_FETCH_OBJECT_NO_CHECK; if (DATE_FORMAT_OBJECT(dfo) != NULL) { - // This is __construct being called on an instance - it is not - // a constructor. + /* This is __construct being called on an instance - it is not + a constructor. */ intl_errors_set(INTL_DATA_ERROR_P(dfo), U_ILLEGAL_ARGUMENT_ERROR, "datefmt_create: cannot call constructor twice", 0); return; diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index dcac83d..9dbfa61 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -564,11 +564,11 @@ SPL_METHOD(SplFixedArray, __construct) int rv; zend_error_handling zeh; -// zend_replace_error_handling(EH_THROW, spl_ce_InvalidArgumentException, &zeh TSRMLS_CC); -// rv = zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &size); -// zend_restore_error_handling(&zeh TSRMLS_CC); + zend_replace_error_handling(EH_THROW, spl_ce_InvalidArgumentException, &zeh TSRMLS_CC); + rv = zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &size); + zend_restore_error_handling(&zeh TSRMLS_CC); - if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &size) == FAILURE) { + if (rv == FAILURE) { return; }

« previous php.cvs (#85996) next »