helly Thu Jan 12 19:21:36 2006 UTC
Modified files:
/php-src/main/streams filter.c
Log:
- Fix two warnings
# Here fixing warnings reveals that it often enough means fixing errors
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/filter.c?r1=1.21&r2=1.22&diff_format=u
Index: php-src/main/streams/filter.c
diff -u php-src/main/streams/filter.c:1.21 php-src/main/streams/filter.c:1.22
--- php-src/main/streams/filter.c:1.21 Thu Jan 12 19:13:50 2006
+++ php-src/main/streams/filter.c Thu Jan 12 19:21:36 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.21 2006/01/12 19:13:50 helly Exp $ */
+/* $Id: filter.c,v 1.22 2006/01/12 19:21:36 helly Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -251,7 +251,7 @@
{
if (--bucket->refcount == 0) {
if (bucket->own_buf) {
- pefree(bucket->is_unicode ? bucket->buf.ustr.val :
bucket->buf.str.val, bucket->is_persistent);
+ pefree(bucket->is_unicode ? (char*)bucket->buf.ustr.val
: bucket->buf.str.val, bucket->is_persistent);
}
pefree(bucket, bucket->is_persistent);
}
@@ -496,7 +496,7 @@
php_stream_filter_chain *chain = filter->chain;
php_stream_filter *f;
int inverted = 0;
- int preferred = (chain = &chain->stream->readfilters ? 1 : 0);
+ int preferred = (chain == &chain->stream->readfilters ? 1 : 0);
for (f = filter->next; f ; f = f->next) {
if ((f->fops->flags & PSFO_FLAG_ACCEPTS_STRING) == 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
