cvs: /php4/ext/gettext gettext.c

sas Fri Sep 24 15:15:18 1999 EDT Modified files: /php4/ext/gettext gettext.c Log: Use new Zend API and some minor cleanup. Index: php4/ext/gettext/gettext.c diff -u php4/ext/gettext/gettext.c:1.7 php4/ext/gettext/gettext.c:1.8 --- php4/ext/gettext/gettext.c:1.7 Mon Aug 2 15:16:41 1999 +++ php4/ext/gettext/gettext.c Fri Sep 24 15:15:17 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gettext.c,v 1.7 1999/08/02 19:16:41 zeev Exp $ */ +/* $Id: gettext.c,v 1.8 1999/09/24 19:15:17 sas Exp $ */ #include <stdio.h> #include "php.h" @@ -47,18 +47,18 @@ PHP_FUNCTION(textdomain) { - pval *domain; + pval **domain; char *domain_name, *retval; + char *val; - if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &domain) == FAILURE) { + if (ARG_COUNT(ht) != 1 || getParametersEx(1, &domain) == FAILURE) { WRONG_PARAM_COUNT; } - convert_to_string(domain); + convert_to_string_ex(domain); - if (strcmp(domain->value.str.val, "") - && strcmp(domain->value.str.val, "0")) - { - domain_name = domain->value.str.val; + val = (*domain)->value.str.val; + if (strcmp(val, "") && strcmp(val, "0")) { + domain_name = val; } else { domain_name = NULL; } @@ -70,80 +70,80 @@ PHP_FUNCTION(gettext) { - pval *msgid; + pval **msgid; char *msgstr; - if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &msgid) == FAILURE) { + if (ARG_COUNT(ht) != 1 || getParametersEx(1, &msgid) == FAILURE) { WRONG_PARAM_COUNT; } - convert_to_string(msgid); + convert_to_string_ex(msgid); - msgstr = gettext(msgid->value.str.val); + msgstr = gettext((*msgid)->value.str.val); RETURN_STRING(msgstr, 1); } PHP_FUNCTION(dgettext) { - pval *domain_name, *msgid; + pval **domain_name, **msgid; char *msgstr; if (ARG_COUNT(ht) != 2 - || getParameters(ht, 2, &domain_name, &msgid) == FAILURE) + || getParametersEx(2, &domain_name, &msgid) == FAILURE) { WRONG_PARAM_COUNT; } - convert_to_string(domain_name); - convert_to_string(msgid); + convert_to_string_ex(domain_name); + convert_to_string_ex(msgid); - msgstr = dgettext(domain_name->value.str.val, msgid->value.str.val); + msgstr = dgettext((*domain_name)->value.str.val, (*msgid)->value.str.val); RETURN_STRING(msgstr, 1); } PHP_FUNCTION(dcgettext) { - pval *domain_name, *msgid, *category; + pval **domain_name, **msgid, **category; char *msgstr; if (ARG_COUNT(ht) != 3 - || getParameters(ht, 3, &domain_name, &msgid, &category) == FAILURE) + || getParametersEx(3, &domain_name, &msgid, &category) == FAILURE) { WRONG_PARAM_COUNT; } - convert_to_string(domain_name); - convert_to_string(msgid); - convert_to_long(category); - - msgstr = dcgettext(domain_name->value.str.val, - msgid->value.str.val, - category->value.lval); + 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); RETURN_STRING(msgstr, 1); } PHP_FUNCTION(bindtextdomain) { - pval *domain_name, *dir; + pval **domain_name, **dir; char *retval, *dir_name; + char *val; if (ARG_COUNT(ht) != 2 - || getParameters(ht, 2, &domain_name, &dir) == FAILURE) + || getParametersEx(2, &domain_name, &dir) == FAILURE) { WRONG_PARAM_COUNT; } - convert_to_string(domain_name); - convert_to_string(dir); + convert_to_string_ex(domain_name); + convert_to_string_ex(dir); - if (strcmp(dir->value.str.val, "") - && strcmp(dir->value.str.val, "0")) - { - dir_name = dir->value.str.val; + val = (*dir)->value.str.val; + if (strcmp(val, "") && strcmp(val, "0")) { + dir_name = val; } else { dir_name = NULL; } - retval = bindtextdomain(domain_name->value.str.val, dir_name); + retval = bindtextdomain((*domain_name)->value.str.val, dir_name); RETURN_STRING(retval, 1); }