cataphract Tue, 27 Sep 2011 11:43:07 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=317393
Log:
- Oops missed return. Also improved the readability of a test.
Changed paths:
U php/php-src/branches/PHP_5_3/ext/calendar/gregor.c
U php/php-src/branches/PHP_5_3/ext/calendar/tests/jdtomonthname.phpt
U php/php-src/branches/PHP_5_4/ext/calendar/gregor.c
U php/php-src/branches/PHP_5_4/ext/calendar/tests/jdtomonthname.phpt
U php/php-src/trunk/ext/calendar/gregor.c
U php/php-src/trunk/ext/calendar/tests/jdtomonthname.phpt
Modified: php/php-src/branches/PHP_5_3/ext/calendar/gregor.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/calendar/gregor.c 2011-09-27 11:26:34 UTC
(rev 317392)
+++ php/php-src/branches/PHP_5_3/ext/calendar/gregor.c 2011-09-27 11:43:07 UTC
(rev 317393)
@@ -182,6 +182,8 @@
*pYear = year;
*pMonth = month;
*pDay = day;
+ return;
+
fail:
*pYear = 0;
*pMonth = 0;
Modified: php/php-src/branches/PHP_5_3/ext/calendar/tests/jdtomonthname.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/calendar/tests/jdtomonthname.phpt
2011-09-27 11:26:34 UTC (rev 317392)
+++ php/php-src/branches/PHP_5_3/ext/calendar/tests/jdtomonthname.phpt
2011-09-27 11:43:07 UTC (rev 317393)
@@ -14,30 +14,37 @@
);
foreach ($jd_days as $jd_day) {
+ echo "=== ", $jd_day, "\n";
var_dump(jdmonthname($jd_day,0));
var_dump(jdmonthname($jd_day,1));
var_dump(jdmonthname($jd_day,2));
var_dump(jdmonthname($jd_day,3));
var_dump(jdmonthname($jd_day,4));
var_dump(jdmonthname($jd_day,5));
+ echo "\n";
}
echo "Done\n";
?>
--EXPECTF--
+=== 2453396
string(3) "Jan"
string(7) "January"
string(3) "Jan"
string(7) "January"
string(6) "Shevat"
string(0) ""
+
+=== 2440588
string(3) "Jan"
string(7) "January"
string(3) "Dec"
string(8) "December"
string(5) "Tevet"
string(0) ""
+
+=== -1
string(0) ""
string(0) ""
string(0) ""
@@ -45,6 +52,8 @@
string(0) ""
string(0) ""
+=== Array
+
Warning: jdmonthname() expects parameter 1 to be long, array given in %s on
line %d
bool(false)
@@ -62,10 +71,13 @@
Warning: jdmonthname() expects parameter 1 to be long, array given in %s on
line %d
bool(false)
+
+=== 10000000
string(3) "Dec"
string(8) "December"
string(3) "Jul"
string(4) "July"
string(6) "Tishri"
string(0) ""
+
Done
Modified: php/php-src/branches/PHP_5_4/ext/calendar/gregor.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/calendar/gregor.c 2011-09-27 11:26:34 UTC
(rev 317392)
+++ php/php-src/branches/PHP_5_4/ext/calendar/gregor.c 2011-09-27 11:43:07 UTC
(rev 317393)
@@ -182,6 +182,8 @@
*pYear = year;
*pMonth = month;
*pDay = day;
+ return;
+
fail:
*pYear = 0;
*pMonth = 0;
Modified: php/php-src/branches/PHP_5_4/ext/calendar/tests/jdtomonthname.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/calendar/tests/jdtomonthname.phpt
2011-09-27 11:26:34 UTC (rev 317392)
+++ php/php-src/branches/PHP_5_4/ext/calendar/tests/jdtomonthname.phpt
2011-09-27 11:43:07 UTC (rev 317393)
@@ -14,30 +14,37 @@
);
foreach ($jd_days as $jd_day) {
+ echo "=== ", $jd_day, "\n";
var_dump(jdmonthname($jd_day,0));
var_dump(jdmonthname($jd_day,1));
var_dump(jdmonthname($jd_day,2));
var_dump(jdmonthname($jd_day,3));
var_dump(jdmonthname($jd_day,4));
var_dump(jdmonthname($jd_day,5));
+ echo "\n";
}
echo "Done\n";
?>
--EXPECTF--
+=== 2453396
string(3) "Jan"
string(7) "January"
string(3) "Jan"
string(7) "January"
string(6) "Shevat"
string(0) ""
+
+=== 2440588
string(3) "Jan"
string(7) "January"
string(3) "Dec"
string(8) "December"
string(5) "Tevet"
string(0) ""
+
+=== -1
string(0) ""
string(0) ""
string(0) ""
@@ -45,6 +52,8 @@
string(0) ""
string(0) ""
+=== Array
+
Warning: jdmonthname() expects parameter 1 to be long, array given in %s on
line %d
bool(false)
@@ -62,10 +71,13 @@
Warning: jdmonthname() expects parameter 1 to be long, array given in %s on
line %d
bool(false)
+
+=== 10000000
string(3) "Dec"
string(8) "December"
string(3) "Jul"
string(4) "July"
string(6) "Tishri"
string(0) ""
+
Done
Modified: php/php-src/trunk/ext/calendar/gregor.c
===================================================================
--- php/php-src/trunk/ext/calendar/gregor.c 2011-09-27 11:26:34 UTC (rev
317392)
+++ php/php-src/trunk/ext/calendar/gregor.c 2011-09-27 11:43:07 UTC (rev
317393)
@@ -182,6 +182,8 @@
*pYear = year;
*pMonth = month;
*pDay = day;
+ return;
+
fail:
*pYear = 0;
*pMonth = 0;
Modified: php/php-src/trunk/ext/calendar/tests/jdtomonthname.phpt
===================================================================
--- php/php-src/trunk/ext/calendar/tests/jdtomonthname.phpt 2011-09-27
11:26:34 UTC (rev 317392)
+++ php/php-src/trunk/ext/calendar/tests/jdtomonthname.phpt 2011-09-27
11:43:07 UTC (rev 317393)
@@ -14,30 +14,37 @@
);
foreach ($jd_days as $jd_day) {
+ echo "=== ", $jd_day, "\n";
var_dump(jdmonthname($jd_day,0));
var_dump(jdmonthname($jd_day,1));
var_dump(jdmonthname($jd_day,2));
var_dump(jdmonthname($jd_day,3));
var_dump(jdmonthname($jd_day,4));
var_dump(jdmonthname($jd_day,5));
+ echo "\n";
}
echo "Done\n";
?>
--EXPECTF--
+=== 2453396
string(3) "Jan"
string(7) "January"
string(3) "Jan"
string(7) "January"
string(6) "Shevat"
string(0) ""
+
+=== 2440588
string(3) "Jan"
string(7) "January"
string(3) "Dec"
string(8) "December"
string(5) "Tevet"
string(0) ""
+
+=== -1
string(0) ""
string(0) ""
string(0) ""
@@ -45,6 +52,8 @@
string(0) ""
string(0) ""
+=== Array
+
Warning: jdmonthname() expects parameter 1 to be long, array given in %s on
line %d
bool(false)
@@ -62,10 +71,13 @@
Warning: jdmonthname() expects parameter 1 to be long, array given in %s on
line %d
bool(false)
+
+=== 10000000
string(3) "Dec"
string(8) "December"
string(3) "Jul"
string(4) "July"
string(6) "Tishri"
string(0) ""
+
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
