rasmus Fri Feb 9 07:28:23 2001 EDT Modified files: /php4/ext/standard datetime.c file.c Log: What the heck is CUT? Assume someone meant UTC here. And fix a warning. Index: php4/ext/standard/datetime.c diff -u php4/ext/standard/datetime.c:1.65 php4/ext/standard/datetime.c:1.66 --- php4/ext/standard/datetime.c:1.65 Thu Jan 18 06:36:43 2001 +++ php4/ext/standard/datetime.c Fri Feb 9 07:28:23 2001 @@ -19,7 +19,7 @@ */ -/* $Id: datetime.c,v 1.65 2001/01/18 14:36:43 andrei Exp $ */ +/* $Id: datetime.c,v 1.66 2001/02/09 15:28:23 rasmus Exp $ */ #include "php.h" @@ -521,7 +521,7 @@ /* }}} */ /* {{{ proto string gmdate(string format [, int timestamp]) - Format a GMT/CUT date/time */ + Format a GMT/UTC date/time */ PHP_FUNCTION(gmdate) { php_date(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); @@ -762,7 +762,7 @@ /* }}} */ /* {{{ proto string gmstrftime(string format [, int timestamp]) - Format a GMT/CUT time/date according to locale settings */ + Format a GMT/UCT time/date according to locale settings */ PHP_FUNCTION(gmstrftime) { _php_strftime(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.137 php4/ext/standard/file.c:1.138 --- php4/ext/standard/file.c:1.137 Thu Feb 1 02:24:02 2001 +++ php4/ext/standard/file.c Fri Feb 9 07:28:23 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.137 2001/02/01 10:24:02 stas Exp $ */ +/* $Id: file.c,v 1.138 2001/02/09 15:28:23 rasmus Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -2083,7 +2083,7 @@ ptr = *buf = emalloc(step); max_len = step; - while(ret = FP_FREAD(ptr, max_len - len, socket, fp, issock)) { + while((ret = FP_FREAD(ptr, max_len - len, socket, fp, issock))) { len += ret; if(len + min_room >= max_len) { *buf = erealloc(*buf, max_len + step); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]