summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2001-02-09 15:28:23 +0000
committerRasmus Lerdorf <rasmus@php.net>2001-02-09 15:28:23 +0000
commit4877d13ffae19339708c2fce8a2745684ea2eaaa (patch)
tree68fbe6397a7b8c04dc51f561518ae053028861a2 /ext
parent279588aa120124113f297b4211395b93db549620 (diff)
downloadphp-git-4877d13ffae19339708c2fce8a2745684ea2eaaa.tar.gz
What the heck is CUT? Assume someone meant UTC here. And fix a
warning.
Diffstat (limited to 'ext')
-rw-r--r--ext/standard/datetime.c4
-rw-r--r--ext/standard/file.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index 630ebb8958..b022e57fce 100644
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -521,7 +521,7 @@ PHP_FUNCTION(date)
/* }}} */
/* {{{ 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 @@ PHP_FUNCTION(strftime)
/* }}} */
/* {{{ 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);
diff --git a/ext/standard/file.c b/ext/standard/file.c
index 26653f80a3..9ce23971f1 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -2083,7 +2083,7 @@ size_t php_fread_all(char **buf, int socket, FILE *fp, int issock) {
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);