summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2011-09-12 10:57:26 +0000
committerXinchen Hui <laruence@php.net>2011-09-12 10:57:26 +0000
commit17858fc78920fce3bf830c80627f4293f2818650 (patch)
treef29af000145129b8156c12603588b7fea029d9d8
parentd0dbb43935b4515043736eaaa0c05014cf0daac6 (diff)
downloadphp-git-17858fc78920fce3bf830c80627f4293f2818650.tar.gz
Merge from branch, make things consistent
-rw-r--r--ext/phar/stream.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/phar/stream.c b/ext/phar/stream.c
index 2addae4db5..21358d1a23 100644
--- a/ext/phar/stream.c
+++ b/ext/phar/stream.c
@@ -403,7 +403,7 @@ static int phar_stream_seek(php_stream *stream, off_t offset, int whence, off_t
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 @@ static int phar_stream_seek(php_stream *stream, off_t offset, int whence, off_t
case SEEK_SET :
temp = data->zero + offset;
break;
+ default:
+ temp = 0;
}
if (temp > data->zero + (off_t) entry->uncompressed_filesize) {
*newoffset = -1;