Re: cvs: php4 /ext/zip zip.c
| From: | World Wide Web Cie | Date: | Wed, 26 Sep 2001 13:10:28 +0000 |
| Subject: | Re: cvs: php4 /ext/zip zip.c | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-7567@lists.php.net to get a copy of this message | ||
On Wed, 26 Sep 2001, Derick Rethans wrote:
> derick Wed Sep 26 08:34:30 2001 EDT
>
> Modified files:
> /php4/ext/zip zip.c
> Log:
> - Fixed error introduced by the macro substitution
I don't think this was caused by that substitution,
because only Z_* macro's were introduced. Not 100% sure though.
For other extensions, revert to PRE_Z_MACRO_SUBST if the script didn't do
things correctly, and drop me a line. It's unneedingly much work to
manually fix it, I'll try to fix the script instead if I see what's wrong.
I now see that I didn't process the sattelite extension thru the newest
version of the script, the newst version did solve the problem... (that
captials weren't understood).
--Jeroen
>
>
> Index: php4/ext/zip/zip.c
> diff -u php4/ext/zip/zip.c:1.19 php4/ext/zip/zip.c:1.20
> --- php4/ext/zip/zip.c:1.19 Wed Sep 26 05:09:40 2001
> +++ php4/ext/zip/zip.c Wed Sep 26 08:34:30 2001
> @@ -16,7 +16,7 @@
> +----------------------------------------------------------------------+
> */
>
> -/* $Id: zip.c,v 1.19 2001/09/26 09:09:40 jeroen Exp $ */
> +/* $Id: zip.c,v 1.20 2001/09/26 12:34:30 derick Exp $ */
>
> #include "php.h"
> #include "php_ini.h"
> @@ -282,10 +282,11 @@
>
> buf = emalloc(len + 1);
> ret = zzip_read(entry->fp, buf, len);
> - if (ret == 0)
> - RETURN_FALSE;
> - else
> - RETURN_STRINGL(buf, len, 0);
> + if (ret == 0) {
> + RETURN_FALSE;
> + } else {
> + RETURN_STRINGL(buf, len, 0);
> + }
> }
> /* }}} */
>
>
>
>