com php-src: fixed ext/gettext: ext/gettext/gettext.c

Commit: 9f9e691c28ffe4eb77ac67f5cd24ee6432e49d18 Author: Anatol Belski <ab@php.net> Fri, 29 Nov 2013 09:47:00 +0100 Parents: 3659dcd98c5a4dcfcad2129e59e0794f4dcac1ca Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9f9e691c28ffe4eb77ac67f5cd24ee6432e49d18 Log: fixed ext/gettext Changed paths: M ext/gettext/gettext.c Diff: diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c index ed86b6c..9b6df28 100644 --- a/ext/gettext/gettext.c +++ b/ext/gettext/gettext.c @@ -162,9 +162,9 @@ PHP_MINFO_FUNCTION(php_gettext) PHP_NAMED_FUNCTION(zif_textdomain) { char *domain, *domain_name, *retval; - int domain_len; + zend_str_size_int domain_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &domain, &domain_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &domain, &domain_len) == FAILURE) { return; } @@ -187,9 +187,9 @@ PHP_NAMED_FUNCTION(zif_textdomain) PHP_NAMED_FUNCTION(zif_gettext) { char *msgid, *msgstr; - int msgid_len; + zend_str_size_int msgid_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &msgid, &msgid_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &msgid, &msgid_len) == FAILURE) { return; } @@ -205,9 +205,9 @@ PHP_NAMED_FUNCTION(zif_gettext) PHP_NAMED_FUNCTION(zif_dgettext) { char *domain, *msgid, *msgstr; - int domain_len, msgid_len; + zend_str_size_int domain_len, msgid_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &domain, &domain_len, &msgid, &msgid_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &domain, &domain_len, &msgid, &msgid_len) == FAILURE) { return; } @@ -225,10 +225,10 @@ PHP_NAMED_FUNCTION(zif_dgettext) PHP_NAMED_FUNCTION(zif_dcgettext) { char *domain, *msgid, *msgstr; - int domain_len, msgid_len; - long category; + zend_str_size_int domain_len, msgid_len; + php_int_t category; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssl", &domain, &domain_len, &msgid, &msgid_len, &category) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSi", &domain, &domain_len, &msgid, &msgid_len, &category) == FAILURE) { return; } @@ -246,10 +246,10 @@ PHP_NAMED_FUNCTION(zif_dcgettext) PHP_NAMED_FUNCTION(zif_bindtextdomain) { char *domain, *dir; - int domain_len, dir_len; + zend_str_size_int domain_len, dir_len; char *retval, dir_name[MAXPATHLEN]; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &domain, &domain_len, &dir, &dir_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &domain, &domain_len, &dir, &dir_len) == FAILURE) { return; } @@ -280,10 +280,10 @@ PHP_NAMED_FUNCTION(zif_bindtextdomain) PHP_NAMED_FUNCTION(zif_ngettext) { char *msgid1, *msgid2, *msgstr; - int msgid1_len, msgid2_len; - long count; + zend_str_size_int msgid1_len, msgid2_len; + php_int_t count; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssl", &msgid1, &msgid1_len, &msgid2, &msgid2_len, &count) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSi", &msgid1, &msgid1_len, &msgid2, &msgid2_len, &count) == FAILURE) { return; } @@ -304,10 +304,10 @@ PHP_NAMED_FUNCTION(zif_ngettext) PHP_NAMED_FUNCTION(zif_dngettext) { char *domain, *msgid1, *msgid2, *msgstr = NULL; - int domain_len, msgid1_len, msgid2_len; - long count; + zend_str_size_int domain_len, msgid1_len, msgid2_len; + php_int_t count; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sssl", &domain, &domain_len, + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSSi", &domain, &domain_len, &msgid1, &msgid1_len, &msgid2, &msgid2_len, &count) == FAILURE) { return; } @@ -330,12 +330,12 @@ PHP_NAMED_FUNCTION(zif_dngettext) PHP_NAMED_FUNCTION(zif_dcngettext) { char *domain, *msgid1, *msgid2, *msgstr = NULL; - int domain_len, msgid1_len, msgid2_len; - long count, category; + zend_str_size_int domain_len, msgid1_len, msgid2_len; + php_int_t count, category; RETVAL_FALSE; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sssll", &domain, &domain_len, + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSSii", &domain, &domain_len, &msgid1, &msgid1_len, &msgid2, &msgid2_len, &count, &category) == FAILURE) { return; } @@ -360,9 +360,9 @@ PHP_NAMED_FUNCTION(zif_dcngettext) PHP_NAMED_FUNCTION(zif_bind_textdomain_codeset) { char *domain, *codeset, *retval = NULL; - int domain_len, codeset_len; + zend_str_size_int domain_len, codeset_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &domain, &domain_len, &codeset, &codeset_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &domain, &domain_len, &codeset, &codeset_len) == FAILURE) { return; }