[PHP4BETA] CVS update: php4/ext/standard

Date: Sunday May 16, 1999 @ 7:10 Author: sas Update of /repository/php4/ext/standard In directory php:/tmp/cvs-serv14740 Modified Files: file.c Log Message: kill some compiler warnings Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.10 php4/ext/standard/file.c:1.11 --- php4/ext/standard/file.c:1.10 Tue Apr 27 09:06:58 1999 +++ php4/ext/standard/file.c Sun May 16 07:10:41 1999 @@ -26,7 +26,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.10 1999/04/27 13:06:58 rasmus Exp $ */ +/* $Id: file.c,v 1.11 1999/05/16 11:10:41 sas Exp $ */ #include "php.h" #include "php_globals.h" #include "ext/standard/flock_compat.h" @@ -319,7 +319,7 @@ } /* Now loop through the file and do the magic quotes thing if needed */ memset(buf,0,8191); - while((issock?SOCK_FGETS(buf,8191,socketd):(int)fgets(buf,8191,fp)) + while((issock?SOCK_FGETS(buf,8191,socketd):fgets(buf,8191,fp) != NULL) && !php3i_stristr(buf,"</head>")) { if(php3i_stristr(buf,"<meta")) { @@ -442,7 +442,7 @@ /* Now loop through the file and do the magic quotes thing if needed */ memset(buf,0,8191); - while(issock?SOCK_FGETS(buf,8191,socketd):(int)fgets(buf,8191,fp)) { + while(issock?SOCK_FGETS(buf,8191,socketd):fgets(buf,8191,fp) != NULL) { if (PG(magic_quotes_runtime)) { int len; @@ -853,7 +853,7 @@ buf = emalloc(sizeof(char) * (len + 1)); /* needed because recv doesnt put a null at the end*/ memset(buf,0,len+1); - if (!(issock?SOCK_FGETS(buf,len,socketd):(int)fgets(buf,len,fp))) { + if (!(issock?SOCK_FGETS(buf,len,socketd):fgets(buf,len,fp) != NULL)) { efree(buf); RETVAL_FALSE; } else { @@ -947,7 +947,7 @@ buf = emalloc(sizeof(char) * (len + 1)); /*needed because recv doesnt set null char at end*/ memset(buf,0,len+1); - if (!(issock?SOCK_FGETS(buf,len,socketd):(int)fgets(buf, len, fp))) { + if (!(issock?SOCK_FGETS(buf,len,socketd):fgets(buf, len, fp) != NULL)) { efree(buf); RETURN_FALSE; } @@ -1556,7 +1556,7 @@ buf = emalloc(sizeof(char) * (len + 1)); /*needed because recv doesnt set null char at end*/ memset(buf,0,len+1); - if (!(issock?SOCK_FGETS(buf,len,socketd):(int)fgets(buf, len, fp))) { + if (!(issock?SOCK_FGETS(buf,len,socketd):fgets(buf, len, fp) != NULL)) { efree(buf); RETURN_FALSE; } -- PHP 4 Beta