cvs: php-src /ext/gettext gettext.c /ext/gettext/tests dcngettext.phpt
| From: | Antony Dovgal | Date: | Tue, 05 Sep 2006 10:35:53 +0000 |
| Subject: | cvs: php-src /ext/gettext gettext.c /ext/gettext/tests dcngettext.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-40310@lists.php.net to get a copy of this message | ||
tony2001 Tue Sep 5 10:35:53 2006 UTC
Added files:
/php-src/ext/gettext/tests dcngettext.phpt
Modified files:
/php-src/ext/gettext gettext.c
Log:
fix segfaulting typo in dcngettext() =)
add new test
http://cvs.php.net/viewvc.cgi/php-src/ext/gettext/gettext.c?r1=1.49&r2=1.50&diff_format=u
Index: php-src/ext/gettext/gettext.c
diff -u php-src/ext/gettext/gettext.c:1.49 php-src/ext/gettext/gettext.c:1.50
--- php-src/ext/gettext/gettext.c:1.49 Wed Jun 14 21:29:22 2006
+++ php-src/ext/gettext/gettext.c Tue Sep 5 10:35:53 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gettext.c,v 1.49 2006/06/14 21:29:22 bjori Exp $ */
+/* $Id: gettext.c,v 1.50 2006/09/05 10:35:53 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -327,7 +327,7 @@
RETVAL_FALSE;
- if (ZEND_NUM_ARGS() != 5 || zend_get_parameters_ex(4, &domain, &msgid1, &msgid2,
&count, &category) == FAILURE) {
+ if (ZEND_NUM_ARGS() != 5 || zend_get_parameters_ex(5, &domain, &msgid1, &msgid2,
&count, &category) == FAILURE) {
WRONG_PARAM_COUNT;
} else {
char* msgstr = NULL;
http://cvs.php.net/viewvc.cgi/php-src/ext/gettext/tests/dcngettext.phpt?view=markup&rev=1.1
Index: php-src/ext/gettext/tests/dcngettext.phpt
+++ php-src/ext/gettext/tests/dcngettext.phpt
--TEST--
dcngettext() tests
--SKIPIF--
<?php
if (!extension_loaded("gettext")) die("skip");
if (!function_exists("dcngettext")) die("skip dcngettext() doesn't exist");
?>
--FILE--
<?php
var_dump(dcngettext(1,1,1,1));
var_dump(dcngettext(1,1,1,1,1));
var_dump(dcngettext("test","test","test",1,1));
var_dump(dcngettext("test","test","test",0,0));
var_dump(dcngettext("test","test","test",-1,-1));
var_dump(dcngettext("","","",1,1));
var_dump(dcngettext("","","",0,0));
echo "Done\n";
?>
--EXPECTF--
Warning: Wrong parameter count for dcngettext() in %s on line %d
bool(false)
string(1) "1"
string(4) "test"
string(4) "test"
string(4) "test"
string(0) ""
string(0) ""
Done