diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
| commit | db72160e5ac2b267b9ffa23ad84e62e609382a44 (patch) | |
| tree | 6e50c2826f98308d500cc826934a503751d4d566 /ext/intl/msgformat/msgformat_parse.c | |
| parent | be88d0e5d4ab5fdf775f3e38cf054aa0451f0d36 (diff) | |
| parent | f469dc7429f2257aac6f46228302408608fbd62f (diff) | |
| download | php-git-db72160e5ac2b267b9ffa23ad84e62e609382a44.tar.gz | |
Merge branch 'master' into integer_semantics
Conflicts:
Zend/zend_operators.h
Diffstat (limited to 'ext/intl/msgformat/msgformat_parse.c')
| -rw-r--r-- | ext/intl/msgformat/msgformat_parse.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/intl/msgformat/msgformat_parse.c b/ext/intl/msgformat/msgformat_parse.c index 3ae9a49b46..516f493ec9 100644 --- a/ext/intl/msgformat/msgformat_parse.c +++ b/ext/intl/msgformat/msgformat_parse.c @@ -28,7 +28,7 @@ #include "intl_convert.h" /* {{{ */ -static void msgfmt_do_parse(MessageFormatter_object *mfo, char *source, int src_len, zval *return_value TSRMLS_DC) +static void msgfmt_do_parse(MessageFormatter_object *mfo, char *source, size_t src_len, zval *return_value TSRMLS_DC) { zval *fargs; int count = 0; @@ -61,7 +61,7 @@ static void msgfmt_do_parse(MessageFormatter_object *mfo, char *source, int src_ PHP_FUNCTION( msgfmt_parse ) { char *source; - int source_len; + size_t source_len; MSG_FORMAT_METHOD_INIT_VARS; @@ -92,11 +92,11 @@ PHP_FUNCTION( msgfmt_parse_message ) UChar *spattern = NULL; int spattern_len = 0; char *pattern = NULL; - int pattern_len = 0; + size_t pattern_len = 0; const char *slocale = NULL; - int slocale_len = 0; + size_t slocale_len = 0; char *source = NULL; - int src_len = 0; + size_t src_len = 0; MessageFormatter_object mf = {0}; MessageFormatter_object *mfo = &mf; |