diff options
| author | Jani Taskinen <jani@php.net> | 2008-11-01 23:09:31 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2008-11-01 23:09:31 +0000 |
| commit | ffa97c549660beb0f15008e8447eb6e5d8b72349 (patch) | |
| tree | ade73e02f3e34195a5c7f49b5a6e74f7cfb9510f /ext | |
| parent | a836ea7b71e4f211bff78aad9be8c0f71f81b0c1 (diff) | |
| download | php-git-ffa97c549660beb0f15008e8447eb6e5d8b72349.tar.gz | |
MFH
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/gettext/gettext.c | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c index b04603b737..4fa2eef235 100644 --- a/ext/gettext/gettext.c +++ b/ext/gettext/gettext.c @@ -144,27 +144,12 @@ ZEND_GET_MODULE(php_gettext) RETURN_FALSE; \ } -#define PHP_GETTEXT_MSGID_LENGTH_CHECK \ - char *check_name = "msgid"; \ - int check_len = msgid_len; \ - PHP_GETTEXT_LENGTH_CHECK - -#define PHP_GETTEXT_LENGTH_CHECK \ +#define PHP_GETTEXT_LENGTH_CHECK(check_name, check_len) \ if (check_len > PHP_GETTEXT_MAX_MSGID_LENGTH) { \ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s passed too long", check_name); \ RETURN_FALSE; \ } -#define PHP_GETTEXT_MULTI_MSGID_LENGTH_CHECK \ - int check_len; \ - char *check_name; \ - check_name = "msgid1"; \ - check_len = msgid1_len; \ - PHP_GETTEXT_LENGTH_CHECK \ - check_name = "msgid2"; \ - check_len = msgid2_len; \ - PHP_GETTEXT_LENGTH_CHECK - PHP_MINFO_FUNCTION(php_gettext) { php_info_print_table_start(); @@ -208,7 +193,7 @@ PHP_NAMED_FUNCTION(zif_gettext) return; } - PHP_GETTEXT_MSGID_LENGTH_CHECK + PHP_GETTEXT_LENGTH_CHECK("msgid", msgid_len) msgstr = gettext(msgid); RETURN_STRING(msgstr, 1); @@ -227,7 +212,7 @@ PHP_NAMED_FUNCTION(zif_dgettext) } PHP_GETTEXT_DOMAIN_LENGTH_CHECK - PHP_GETTEXT_MSGID_LENGTH_CHECK + PHP_GETTEXT_LENGTH_CHECK("msgid", msgid_len) msgstr = dgettext(domain, msgid); @@ -248,7 +233,7 @@ PHP_NAMED_FUNCTION(zif_dcgettext) } PHP_GETTEXT_DOMAIN_LENGTH_CHECK - PHP_GETTEXT_MSGID_LENGTH_CHECK + PHP_GETTEXT_LENGTH_CHECK("msgid", msgid_len) msgstr = dcgettext(domain, msgid, category); @@ -302,7 +287,8 @@ PHP_NAMED_FUNCTION(zif_ngettext) return; } - PHP_GETTEXT_MULTI_MSGID_LENGTH_CHECK + PHP_GETTEXT_LENGTH_CHECK("msgid1", msgid1_len) + PHP_GETTEXT_LENGTH_CHECK("msgid2", msgid2_len) msgstr = ngettext(msgid1, msgid2, count); if (msgstr) { @@ -327,7 +313,8 @@ PHP_NAMED_FUNCTION(zif_dngettext) } PHP_GETTEXT_DOMAIN_LENGTH_CHECK - PHP_GETTEXT_MULTI_MSGID_LENGTH_CHECK + PHP_GETTEXT_LENGTH_CHECK("msgid1", msgid1_len) + PHP_GETTEXT_LENGTH_CHECK("msgid2", msgid2_len) msgstr = dngettext(domain, msgid1, msgid2, count); if (msgstr) { @@ -354,7 +341,8 @@ PHP_NAMED_FUNCTION(zif_dcngettext) } PHP_GETTEXT_DOMAIN_LENGTH_CHECK - PHP_GETTEXT_MULTI_MSGID_LENGTH_CHECK + PHP_GETTEXT_LENGTH_CHECK("msgid1", msgid1_len) + PHP_GETTEXT_LENGTH_CHECK("msgid2", msgid2_len) msgstr = dcngettext(domain, msgid1, msgid2, count, category); |