cvs: php-src /ext/dba dba_flatfile.c /ext/dba/libinifile inifile.c

helly Wed Dec 17 03:50:51 2003 EDT Modified files: /php-src/ext/dba dba_flatfile.c /php-src/ext/dba/libinifile inifile.c Log: Fix warnings Index: php-src/ext/dba/dba_flatfile.c diff -u php-src/ext/dba/dba_flatfile.c:1.15 php-src/ext/dba/dba_flatfile.c:1.16 --- php-src/ext/dba/dba_flatfile.c:1.15 Tue Dec 16 16:40:19 2003 +++ php-src/ext/dba/dba_flatfile.c Wed Dec 17 03:50:50 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_flatfile.c,v 1.15 2003/12/16 21:40:19 helly Exp $ */ +/* $Id: dba_flatfile.c,v 1.16 2003/12/17 08:50:50 helly Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -41,7 +41,10 @@ DBA_OPEN_FUNC(flatfile) { - int fd, flags; + int fd; +#ifdef F_SETFL + int flags; +#endif if (info->mode != DBA_READER) { if (SUCCESS != php_stream_cast(info->fp, PHP_STREAM_AS_FD, (void*)&fd, 1)) { Index: php-src/ext/dba/libinifile/inifile.c diff -u php-src/ext/dba/libinifile/inifile.c:1.10 php-src/ext/dba/libinifile/inifile.c:1.11 --- php-src/ext/dba/libinifile/inifile.c:1.10 Sun Dec 14 17:07:29 2003 +++ php-src/ext/dba/libinifile/inifile.c Wed Dec 17 03:50:50 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: inifile.c,v 1.10 2003/12/14 22:07:29 helly Exp $ */ +/* $Id: inifile.c,v 1.11 2003/12/17 08:50:50 helly Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -43,7 +43,7 @@ /* {{{ inifile_version */ char *inifile_version() { - return "1.0, $Revision: 1.10 $"; + return "1.0, $Revision: 1.11 $"; } /* }}} */ @@ -500,7 +500,7 @@ ret = FAILURE; } else { php_stream_seek(dba->fp, 0, SEEK_END); - if (pos_grp_next != php_stream_tell(dba->fp)) { + if (pos_grp_next != (size_t)php_stream_tell(dba->fp)) { php_stream_seek(dba->fp, pos_grp_next, SEEK_SET); if (!php_stream_copy_to_stream(dba->fp, fp_tmp, PHP_STREAM_COPY_ALL)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not copy remainder to temporary stream");