diff options
Diffstat (limited to 'ext/calendar')
-rw-r--r-- | ext/calendar/cal_unix.c | 6 | ||||
-rw-r--r-- | ext/calendar/calendar.c | 38 |
2 files changed, 22 insertions, 22 deletions
diff --git a/ext/calendar/cal_unix.c b/ext/calendar/cal_unix.c index 80853eac3d..cb3ff68ac9 100644 --- a/ext/calendar/cal_unix.c +++ b/ext/calendar/cal_unix.c @@ -34,7 +34,7 @@ PHP_FUNCTION(unixtojd) struct tm *ta, tmbuf; int myargc=ZEND_NUM_ARGS(); - if ((myargc > 1) || (zend_get_parameters(ht,myargc, ×tamp) != SUCCESS)) { + if ((myargc > 1) || (zend_get_parameters(ht, myargc, ×tamp) != SUCCESS)) { WRONG_PARAM_COUNT; } @@ -50,7 +50,7 @@ PHP_FUNCTION(unixtojd) } ta = php_localtime_r(&t, &tmbuf); - jdate = GregorianToSdn(ta->tm_year+1900, ta->tm_mon+1,ta->tm_mday); + jdate = GregorianToSdn(ta->tm_year+1900, ta->tm_mon+1, ta->tm_mday); RETURN_LONG(jdate); } @@ -63,7 +63,7 @@ PHP_FUNCTION(jdtounix) pval *jday; long uday; - if ((ZEND_NUM_ARGS()!= 1) || (zend_get_parameters(ht,1, &jday) != SUCCESS)) { + if ((ZEND_NUM_ARGS()!= 1) || (zend_get_parameters(ht, 1, &jday) != SUCCESS)) { WRONG_PARAM_COUNT; } diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c index 83e92b0e44..5fafa8de32 100644 --- a/ext/calendar/calendar.c +++ b/ext/calendar/calendar.c @@ -299,7 +299,7 @@ PHP_FUNCTION(jdtogregorian) SdnToGregorian((*julday)->value.lval, &year, &month, &day); sprintf(date, "%i/%i/%i", month, day, year); - RETURN_STRING(date,1); + RETURN_STRING(date, 1); } /* }}} */ @@ -318,7 +318,7 @@ PHP_FUNCTION(jdtogregorian) convert_to_long_ex(day); convert_to_long_ex(year); - jdate = GregorianToSdn((*year)->value.lval, (*month)->value.lval,(*day)->value.lval); + jdate = GregorianToSdn((*year)->value.lval, (*month)->value.lval, (*day)->value.lval); RETURN_LONG(jdate); } @@ -340,7 +340,7 @@ PHP_FUNCTION(jdtogregorian) SdnToJulian((*julday)->value.lval, &year, &month, &day); sprintf(date, "%i/%i/%i", month, day, year); - RETURN_STRING(date,1); + RETURN_STRING(date, 1); } /* }}} */ @@ -359,7 +359,7 @@ PHP_FUNCTION(jdtogregorian) convert_to_long_ex(day); convert_to_long_ex(year); - jdate = JulianToSdn((*year)->value.lval,(*month)->value.lval, (*day)->value.lval); + jdate = JulianToSdn((*year)->value.lval, (*month)->value.lval, (*day)->value.lval); RETURN_LONG(jdate); } @@ -382,7 +382,7 @@ PHP_FUNCTION(jdtogregorian) SdnToJewish((*julday)->value.lval, &year, &month, &day); sprintf(date, "%i/%i/%i", month, day, year); - RETURN_STRING(date,1); + RETURN_STRING(date, 1); } /* }}} */ @@ -401,7 +401,7 @@ PHP_FUNCTION(jdtogregorian) convert_to_long_ex(day); convert_to_long_ex(year); - jdate = JewishToSdn((*year)->value.lval,(*month)->value.lval, (*day)->value.lval); + jdate = JewishToSdn((*year)->value.lval, (*month)->value.lval, (*day)->value.lval); RETURN_LONG(jdate); } @@ -424,7 +424,7 @@ PHP_FUNCTION(jdtogregorian) SdnToFrench((*julday)->value.lval, &year, &month, &day); sprintf(date, "%i/%i/%i", month, day, year); - RETURN_STRING(date,1); + RETURN_STRING(date, 1); } /* }}} */ @@ -443,7 +443,7 @@ PHP_FUNCTION(jdtogregorian) convert_to_long_ex(day); convert_to_long_ex(year); - jdate = FrenchToSdn((*year)->value.lval,(*month)->value.lval,(*day)->value.lval); + jdate = FrenchToSdn((*year)->value.lval, (*month)->value.lval, (*day)->value.lval); RETURN_LONG(jdate); } @@ -456,9 +456,9 @@ PHP_FUNCTION(jdtogregorian) pval *julday, *mode; int day; char *daynamel, *daynames; - int myargc=ZEND_NUM_ARGS(),mymode=0; + int myargc=ZEND_NUM_ARGS(), mymode=0; - if ((myargc < 1) || (myargc > 2) || (zend_get_parameters(ht,myargc, &julday, &mode) != SUCCESS)) { + if ((myargc < 1) || (myargc > 2) || (zend_get_parameters(ht, myargc, &julday, &mode) != SUCCESS)) { WRONG_PARAM_COUNT; } @@ -474,10 +474,10 @@ PHP_FUNCTION(jdtogregorian) switch (mymode) { case CAL_DOW_SHORT: - RETURN_STRING(daynamel,1); + RETURN_STRING(daynamel, 1); break; case CAL_DOW_LONG: - RETURN_STRING(daynames,1); + RETURN_STRING(daynames, 1); break; case CAL_DOW_DAYNO: default: @@ -504,33 +504,33 @@ PHP_FUNCTION(jdtogregorian) switch((*mode)->value.lval) { case CAL_MONTH_GREGORIAN_LONG: /* gregorian or julian month */ - SdnToGregorian((*julday)->value.lval,&year, &month, &day); + SdnToGregorian((*julday)->value.lval, &year, &month, &day); monthname = MonthNameLong[month]; break; case CAL_MONTH_JULIAN_SHORT: /* gregorian or julian month */ - SdnToJulian((*julday)->value.lval, &year,&month, &day); + SdnToJulian((*julday)->value.lval, &year, &month, &day); monthname = MonthNameShort[month]; break; case CAL_MONTH_JULIAN_LONG: /* gregorian or julian month */ - SdnToJulian((*julday)->value.lval, &year,&month, &day); + SdnToJulian((*julday)->value.lval, &year, &month, &day); monthname = MonthNameLong[month]; break; case CAL_MONTH_JEWISH: /* jewish month */ - SdnToJewish((*julday)->value.lval, &year,&month, &day); + SdnToJewish((*julday)->value.lval, &year, &month, &day); monthname = JewishMonthName[month]; break; case CAL_MONTH_FRENCH: /* french month */ - SdnToFrench((*julday)->value.lval, &year,&month, &day); + SdnToFrench((*julday)->value.lval, &year, &month, &day); monthname = FrenchMonthName[month]; break; default: /* default gregorian */ case CAL_MONTH_GREGORIAN_SHORT: /* gregorian or julian month */ - SdnToGregorian((*julday)->value.lval,&year, &month, &day); + SdnToGregorian((*julday)->value.lval, &year, &month, &day); monthname = MonthNameShort[month]; break; } - RETURN_STRING(monthname,1); + RETURN_STRING(monthname, 1); } /* }}} */ |