From cb33a3a2c0c7f44ea6c150a9b5f9dbec6b3b97d2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gustavo=20Andr=C3=A9=20dos=20Santos=20Lopes?= Date: Tue, 27 Sep 2011 11:43:07 +0000 Subject: [PATCH] - Oops missed return. Also improved the readability of a test. --- ext/calendar/gregor.c | 2 ++ ext/calendar/tests/jdtomonthname.phpt | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/ext/calendar/gregor.c b/ext/calendar/gregor.c index 7e33d36c66..ebb743fddc 100644 --- a/ext/calendar/gregor.c +++ b/ext/calendar/gregor.c @@ -182,6 +182,8 @@ void SdnToGregorian( *pYear = year; *pMonth = month; *pDay = day; + return; + fail: *pYear = 0; *pMonth = 0; diff --git a/ext/calendar/tests/jdtomonthname.phpt b/ext/calendar/tests/jdtomonthname.phpt index 76d127d6be..5dc3307428 100644 --- a/ext/calendar/tests/jdtomonthname.phpt +++ b/ext/calendar/tests/jdtomonthname.phpt @@ -14,30 +14,37 @@ $jd_days = Array( ); 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) "" string(0) "" +=== Array + Warning: jdmonthname() expects parameter 1 to be long, array given in %s on line %d bool(false) @@ -62,10 +71,13 @@ bool(false) 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 -- 2.40.0