cvs: php-src(PHP_5_3) /ext/phar tar.c
| From: | Greg Beaver | Date: | Sun, 31 Aug 2008 19:47:31 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/phar tar.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-52853@lists.php.net to get a copy of this message | ||
cellog Sun Aug 31 19:47:31 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar tar.c
Log:
hadn't saved tar.c, use '\0' instead of 0 for char values, removes warning in intel
compiler
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tar.c?r1=1.55.2.19&r2=1.55.2.20&diff_format=u
Index: php-src/ext/phar/tar.c
diff -u php-src/ext/phar/tar.c:1.55.2.19 php-src/ext/phar/tar.c:1.55.2.20
--- php-src/ext/phar/tar.c:1.55.2.19 Sun Aug 31 06:51:49 2008
+++ php-src/ext/phar/tar.c Sun Aug 31 19:47:31 2008
@@ -290,7 +290,7 @@
}
/* signature checked out, let's ensure this is the last file in the phar */
size = ((size+511)&~511) + 512;
- if (((hdr->typeflag == 0) || (hdr->typeflag == TAR_FILE)) && size > 0) {
+ if (((hdr->typeflag == '\0') || (hdr->typeflag == TAR_FILE)) && size
> 0) {
/* this is not good enough - seek succeeds even on truncated tars */
php_stream_seek(fp, size, SEEK_CUR);
if ((uint)php_stream_tell(fp) > totalsize) {
@@ -471,7 +471,7 @@
size = (size+511)&~511;
- if (((hdr->typeflag == 0) || (hdr->typeflag == TAR_FILE)) && size > 0) {
+ if (((hdr->typeflag == '\0') || (hdr->typeflag == TAR_FILE)) && size >
0) {
/* this is not good enough - seek succeeds even on truncated tars */
php_stream_seek(fp, size, SEEK_CUR);
if ((uint)php_stream_tell(fp) > totalsize) {