CVS update: php4/ext/standard
| From: | ssb | Date: | Tue, 15 Jun 1999 21:56:12 +0000 |
| Subject: | CVS update: php4/ext/standard | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-1577@lists.php.net to get a copy of this message | ||
Date: Tuesday June 15, 1999 @ 17:56
Author: ssb
Update of /repository/php4/ext/standard
In directory php:/tmp/cvs-serv13614
Modified Files:
file.c
Log Message:
reversing another patch that slipped
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.16 php4/ext/standard/file.c:1.17
--- php4/ext/standard/file.c:1.16 Tue Jun 15 17:50:59 1999
+++ php4/ext/standard/file.c Tue Jun 15 17:56:11 1999
@@ -26,7 +26,7 @@
| Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> |
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.16 1999/06/15 21:50:59 ssb Exp $ */
+/* $Id: file.c,v 1.17 1999/06/15 21:56:11 ssb Exp $ */
#include "php.h"
#include "php_globals.h"
#include "ext/standard/flock_compat.h"
@@ -720,7 +720,7 @@
/* we're at the eof if the file doesn't exist */
RETURN_TRUE;
}
- if ((issock?(SOCK_FEOF(socketd)):feof(fp))) {
+ if ((issock?(_php3_sock_eof(socketd)):feof(fp))) {
RETURN_TRUE;
} else {
RETURN_FALSE;
@@ -896,7 +896,7 @@
RETURN_FALSE;
}
buf = emalloc(sizeof(char) * 2);
- if (!(issock?(*buf=SOCK_FGETC(socketd)):(*buf=fgetc(fp)))) {
+ if (!(issock?(SOCK_FGETC(buf,socketd)):(*buf=fgetc(fp)))) {
efree(buf);
RETVAL_FALSE;
} else {