From 4fbaddb4f8b041769bea7efdd12313641387bd14 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Sat, 28 Jun 2014 00:02:50 +0800 Subject: Refactoring ext/intl (incompleted) --- ext/intl/msgformat/msgformat_attr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/intl/msgformat/msgformat_attr.c') diff --git a/ext/intl/msgformat/msgformat_attr.c b/ext/intl/msgformat/msgformat_attr.c index c333a24ee1..a306fc4421 100644 --- a/ext/intl/msgformat/msgformat_attr.c +++ b/ext/intl/msgformat/msgformat_attr.c @@ -47,7 +47,7 @@ PHP_FUNCTION( msgfmt_get_pattern ) MSG_FORMAT_METHOD_FETCH_OBJECT; if(mfo->mf_data.orig_format) { - RETURN_STRINGL(mfo->mf_data.orig_format, mfo->mf_data.orig_format_len, 1); + RETURN_STRINGL(mfo->mf_data.orig_format, mfo->mf_data.orig_format_len); } RETURN_FALSE; @@ -137,7 +137,7 @@ PHP_FUNCTION( msgfmt_get_locale ) MSG_FORMAT_METHOD_FETCH_OBJECT; loc = (char *)umsg_getLocale(MSG_FORMAT_OBJECT(mfo)); - RETURN_STRING(loc, 1); + RETURN_STRING(loc); } /* }}} */ -- cgit v1.2.1 From 3234480827b27ff5d3469a732167afd289632a96 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 27 Aug 2014 15:31:48 +0200 Subject: first show to make 's' work with size_t --- ext/intl/msgformat/msgformat_attr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/intl/msgformat/msgformat_attr.c') diff --git a/ext/intl/msgformat/msgformat_attr.c b/ext/intl/msgformat/msgformat_attr.c index a306fc4421..9359b796c3 100644 --- a/ext/intl/msgformat/msgformat_attr.c +++ b/ext/intl/msgformat/msgformat_attr.c @@ -62,7 +62,7 @@ PHP_FUNCTION( msgfmt_get_pattern ) PHP_FUNCTION( msgfmt_set_pattern ) { char* value = NULL; - int value_len = 0; + size_t value_len = 0; int spattern_len = 0; UChar* spattern = NULL; MSG_FORMAT_METHOD_INIT_VARS; -- cgit v1.2.1 From d0cb715373c3fbe9dc095378ec5ed8c71f799f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= Date: Fri, 19 Sep 2014 18:33:14 +0200 Subject: s/PHP 5/PHP 7/ --- ext/intl/msgformat/msgformat_attr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/intl/msgformat/msgformat_attr.c') diff --git a/ext/intl/msgformat/msgformat_attr.c b/ext/intl/msgformat/msgformat_attr.c index 9359b796c3..79c04266e0 100644 --- a/ext/intl/msgformat/msgformat_attr.c +++ b/ext/intl/msgformat/msgformat_attr.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | 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 | -- cgit v1.2.1