From: Xinchen Hui <laruence@php.net>
Date: Mon, 12 Sep 2011 10:57:26 +0000 (+0000)
Subject: Merge from branch, make things consistent
X-Git-Tag: php-5.5.0alpha1~1181
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17858fc78920fce3bf830c80627f4293f2818650;p=php

Merge from branch, make things consistent
---

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;