cvs: php4 /ext/gettext gettext.c

sniper Fri Dec 8 08:25:38 2000 EDT Modified files: /php4/ext/gettext gettext.c Log: wb clean. Index: php4/ext/gettext/gettext.c diff -u php4/ext/gettext/gettext.c:1.22 php4/ext/gettext/gettext.c:1.23 --- php4/ext/gettext/gettext.c:1.22 Fri Dec 8 01:20:42 2000 +++ php4/ext/gettext/gettext.c Fri Dec 8 08:25:38 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gettext.c,v 1.22 2000/12/08 09:20:42 zak Exp $ */ +/* $Id: gettext.c,v 1.23 2000/12/08 16:25:38 sniper Exp $ */ #include <stdio.h> #include "php.h" @@ -28,12 +28,12 @@ #include "ext/standard/info.h" function_entry php_gettext_functions[] = { - PHP_FE(textdomain, NULL) - PHP_FE(gettext, NULL) - PHP_FALIAS(_, gettext, NULL) - PHP_FE(dgettext, NULL) - PHP_FE(dcgettext, NULL) - PHP_FE(bindtextdomain, NULL) + PHP_FE(textdomain, NULL) + PHP_FE(gettext, NULL) + PHP_FALIAS(_, gettext, NULL) + PHP_FE(dgettext, NULL) + PHP_FE(dcgettext, NULL) + PHP_FE(bindtextdomain, NULL) {NULL, NULL, NULL} }; @@ -56,12 +56,12 @@ PHP_MINIT_FUNCTION(gettext) { REGISTER_LONG_CONSTANT("LC_CTYPE", LC_CTYPE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("LC_NUMERIC", LC_NUMERIC, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("LC_TIME", LC_TIME, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("LC_COLLATE", LC_COLLATE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("LC_MONETARY", LC_MONETARY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("LC_MESSAGES", LC_MESSAGES, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("LC_ALL", LC_ALL, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("LC_NUMERIC", LC_NUMERIC, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("LC_TIME", LC_TIME, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("LC_COLLATE", LC_COLLATE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("LC_MONETARY", LC_MONETARY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("LC_MESSAGES", LC_MESSAGES, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("LC_ALL", LC_ALL, CONST_CS | CONST_PERSISTENT); return SUCCESS; } @@ -69,14 +69,14 @@ Set the textdomain to "domain". Returns the current domain */ PHP_FUNCTION(textdomain) { - pval **domain; - char *domain_name, *retval; + pval **domain; + char *domain_name, *retval; char *val; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &domain) == FAILURE) { + if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &domain) == FAILURE) { WRONG_PARAM_COUNT; - } - convert_to_string_ex(domain); + } + convert_to_string_ex(domain); val = (*domain)->value.str.val; if (strcmp(val, "") && strcmp(val, "0")) { @@ -87,7 +87,7 @@ retval = textdomain(domain_name); - RETURN_STRING(retval, 1); + RETURN_STRING(retval, 1); } /* }}} */ @@ -95,17 +95,17 @@ Return the translation of msgid for the current domain, or msgid unaltered if a translation does not exist */ PHP_FUNCTION(gettext) { - pval **msgid; - char *msgstr; + pval **msgid; + char *msgstr; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &msgid) == FAILURE) { + if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &msgid) == FAILURE) { WRONG_PARAM_COUNT; - } - convert_to_string_ex(msgid); + } + convert_to_string_ex(msgid); - msgstr = gettext((*msgid)->value.str.val); + msgstr = gettext((*msgid)->value.str.val); - RETURN_STRING(msgstr, 1); + RETURN_STRING(msgstr, 1); } /* }}} */ @@ -116,9 +116,7 @@ pval **domain_name, **msgid; char *msgstr; - if (ZEND_NUM_ARGS() != 2 - || zend_get_parameters_ex(2, &domain_name, &msgid) == FAILURE) - { + if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &domain_name, &msgid) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(domain_name); @@ -137,18 +135,16 @@ pval **domain_name, **msgid, **category; char *msgstr; - if (ZEND_NUM_ARGS() != 3 - || zend_get_parameters_ex(3, &domain_name, &msgid, &category) == FAILURE) - { + if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &domain_name, &msgid, &category) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(domain_name); convert_to_string_ex(msgid); convert_to_long_ex(category); - msgstr = dcgettext((*domain_name)->value.str.val, - (*msgid)->value.str.val, - (*category)->value.lval); + msgstr = dcgettext( (*domain_name)->value.str.val, + (*msgid)->value.str.val, + (*category)->value.lval); RETURN_STRING(msgstr, 1); } @@ -161,9 +157,7 @@ pval **domain_name, **dir; char *retval, dir_name[MAXPATHLEN]; - if (ZEND_NUM_ARGS() != 2 - || zend_get_parameters_ex(2, &domain_name, &dir) == FAILURE) - { + if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &domain_name, &dir) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(domain_name);