laruence Mon, 12 Sep 2011 10:57:26 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=316527
Log:
Merge from branch, make things consistent
Changed paths:
U php/php-src/trunk/ext/phar/stream.c
Modified: php/php-src/trunk/ext/phar/stream.c
===================================================================
--- php/php-src/trunk/ext/phar/stream.c 2011-09-12 10:24:27 UTC (rev 316526)
+++ php/php-src/trunk/ext/phar/stream.c 2011-09-12 10:57:26 UTC (rev 316527)
@@ -403,7 +403,7 @@
phar_entry_data *data = (phar_entry_data *)stream->abstract;
phar_entry_info *entry;
int res;
- off_t temp = 0;
+ off_t temp;
if (data->internal_file->link) {
entry = phar_get_link_source(data->internal_file TSRMLS_CC);
@@ -421,6 +421,8 @@
case SEEK_SET :
temp = data->zero + offset;
break;
+ default:
+ temp = 0;
}
if (temp > data->zero + (off_t) entry->uncompressed_filesize) {
*newoffset = -1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
