Re: [PHP-CVS] svn: /php/php-src/trunk/ext/phar/ stream.c

2011-09-12 Thread Hannes Magnusson 
On Sun, Aug 7, 2011 at 07:24, Xinchen Hui larue...@php.net wrote:
 laruence                                 Sun, 07 Aug 2011 05:24:11 +

 Revision: http://svn.php.net/viewvc?view=revisionrevision=314401

 Log:
 Initialize temp with 0, avoiding compile warning

 Changed paths:
    U   php/php-src/trunk/ext/phar/stream.c


What about 5_4 and 5_3?

-Hannes

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/trunk/ext/phar/ stream.c

2011-09-12 Thread Laruence 
2011/9/12 Hannes Magnusson hannes.magnus...@gmail.com:
 On Sun, Aug 7, 2011 at 07:24, Xinchen Hui larue...@php.net wrote:
 laruence                                 Sun, 07 Aug 2011 05:24:11 +

 Revision: http://svn.php.net/viewvc?view=revisionrevision=314401

 Log:
 Initialize temp with 0, avoiding compile warning

 Changed paths:
    U   php/php-src/trunk/ext/phar/stream.c


 What about 5_4 and 5_3?

 -Hannes

Hi:
   they have be fixed,  and there are some inconformity in branch and
trunk, I will fix soon.

thanks

-- 
Laruence  Xinchen Hui
http://www.laruence.com/

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/ext/phar/ stream.c

2011-09-12 Thread Xinchen Hui 
laruence Mon, 12 Sep 2011 10:57:26 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=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

[PHP-CVS] svn: /php/php-src/trunk/ext/phar/ stream.c

2011-08-06 Thread Xinchen Hui 
laruence Sun, 07 Aug 2011 05:24:11 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=314401

Log:
Initialize temp with 0, avoiding compile warning

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-08-07 05:20:49 UTC (rev 314400)
+++ php/php-src/trunk/ext/phar/stream.c 2011-08-07 05:24:11 UTC (rev 314401)
@@ -403,7 +403,7 @@
phar_entry_data *data = (phar_entry_data *)stream-abstract;
phar_entry_info *entry;
int res;
-   off_t temp;
+   off_t temp = 0;

if (data-internal_file-link) {
entry = phar_get_link_source(data-internal_file TSRMLS_CC);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php