Re: [PHP-CVS] cvs: php-src /ext/fileinfo/libmagic compress.c

It compiled fine on 5.3, and there is no references to that define. I
think something was not merged into HEAD.

On 6-Sep-08, at 7:12 PM, Felix De Vliegher wrote:

> Hi Ilia
>
> I might be wrong but with removing those, building actually fails
> with me.
>
> /home/felixdv/php/cvs/php6dev/ext/fileinfo/libmagic/compress.c: In
> function 'file_zmagic':
> /home/felixdv/php/cvs/php6dev/ext/fileinfo/libmagic/compress.c:106:
> error: 'ncompr' undeclared (first use in this function)
> /home/felixdv/php/cvs/php6dev/ext/fileinfo/libmagic/compress.c:106:
> error: (Each undeclared identifier is reported only once
> /home/felixdv/php/cvs/php6dev/ext/fileinfo/libmagic/compress.c:106:
> error: for each function it appears in.)
> /home/felixdv/php/cvs/php6dev/ext/fileinfo/libmagic/compress.c: In
> function 'sread':
> /home/felixdv/php/cvs/php6dev/ext/fileinfo/libmagic/compress.c:183:
> error: 'cnt' undeclared (first use in this function)
>
> Regards,
> Felix
>
> Op 6-sep-08, om 23:32 heeft Ilia Alshanetsky het volgende geschreven:
>
>> iliaa Sat Sep 6 21:32:32 2008 UTC
>>
>> Modified files:
>> /php-src/ext/fileinfo/libmagic compress.c
>> Log:
>> MFB: removed unused variables
>>
>>
>> http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/compress.c?r1=1.2&r2=1.3&diff_format=u
>> Index: php-src/ext/fileinfo/libmagic/compress.c
>> diff -u php-src/ext/fileinfo/libmagic/compress.c:1.2 php-src/ext/
>> fileinfo/libmagic/compress.c:1.3
>> --- php-src/ext/fileinfo/libmagic/compress.c:1.2 Tue Aug 26
>> 12:24:12 2008
>> +++ php-src/ext/fileinfo/libmagic/compress.c Sat Sep 6 21:32:32 2008
>> @@ -80,8 +80,6 @@
>> { "BZh", 3, { "bzip2", "-cd", NULL }, 1 }, /* bzip2-ed */
>> };
>>
>> -private size_t ncompr = sizeof(compr) / sizeof(compr[0]);
>> -
>> #define NODATA ((size_t)~0)
>>
>>
>> @@ -170,7 +168,7 @@
>> protected ssize_t
>> sread(int fd, void *buf, size_t n, int canbepipe)
>> {
>> - int rv, cnt;
>> + int rv;
>> #ifdef FIONREAD
>> int t = 0;
>>