cvs: php4 /ext/standard filters.c

moriyoshi Sun Jan 12 08:41:35 2003 EDT Modified files: /php4/ext/standard filters.c Log: Fixed error msg format so it correctly reports the actual filter name Index: php4/ext/standard/filters.c diff -u php4/ext/standard/filters.c:1.10 php4/ext/standard/filters.c:1.11 --- php4/ext/standard/filters.c:1.10 Sun Jan 12 07:48:13 2003 +++ php4/ext/standard/filters.c Sun Jan 12 08:41:35 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filters.c,v 1.10 2003/01/12 12:48:13 moriyoshi Exp $ */ +/* $Id: filters.c,v 1.11 2003/01/12 13:41:35 moriyoshi Exp $ */ #include "php.h" #include "php_globals.h" @@ -869,15 +869,15 @@ break; case PHP_CONV_ERR_UNKNOWN: - php_error(E_WARNING, "stream filter(%s): unknown error", thisfilter->fops->label, err); + php_error(E_WARNING, "stream filter (%s): unknown error", inst->filtername, err); return 0; case PHP_CONV_ERR_INVALID_SEQ: - php_error(E_WARNING, "stream filter(%s): invalid base64 sequence", thisfilter->fops->label, err); + php_error(E_WARNING, "stream filter (%s): invalid base64 sequence", inst->filtername, err); return 0; case PHP_CONV_ERR_UNEXPECTED_EOS: - php_error(E_WARNING, "stream filter(%s): unexpected end of stream", thisfilter->fops->label, err); + php_error(E_WARNING, "stream filter (%s): unexpected end of stream", inst->filtername, err); return 0; default: @@ -923,15 +923,15 @@ switch (err) { case PHP_CONV_ERR_UNKNOWN: - php_error(E_WARNING, "stream filter(%s): unknown error", thisfilter->fops->label, err); + php_error(E_WARNING, "stream filter (%s): unknown error", inst->filtername, err); return 0; case PHP_CONV_ERR_INVALID_SEQ: - php_error(E_WARNING, "stream filter(%s): invalid base64 sequence", thisfilter->fops->label, err); + php_error(E_WARNING, "stream filter (%s): invalid base64 sequence", inst->filtername, err); return 0; case PHP_CONV_ERR_UNEXPECTED_EOS: - php_error(E_WARNING, "stream filter(%s): unexpected end of stream", thisfilter->fops->label, err); + php_error(E_WARNING, "stream filter (%s): unexpected end of stream", inst->filtername, err); return 0; default: @@ -968,7 +968,7 @@ out_p = bucket_buf; out_left = sizeof(bucket_buf); } else { - php_error(E_WARNING, "stream filter(%s): unknown error", thisfilter->fops->label); + php_error(E_WARNING, "stream filter (%s): unknown error", inst->filtername); return 0; } }