moriyoshi               Tue Jan  7 17:52:24 2003 EDT

  Modified files:              
    /php4/ext/standard  filters.c 
  Log:
  Made error msg format more consistent
  
  
Index: php4/ext/standard/filters.c
diff -u php4/ext/standard/filters.c:1.6 php4/ext/standard/filters.c:1.7
--- php4/ext/standard/filters.c:1.6     Mon Jan  6 20:41:18 2003
+++ php4/ext/standard/filters.c Tue Jan  7 17:52:24 2003
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: filters.c,v 1.6 2003/01/07 01:41:18 moriyoshi Exp $ */
+/* $Id: filters.c,v 1.7 2003/01/07 22:52:24 moriyoshi Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -375,7 +375,7 @@
 
                        if (!(i & 0xc0)) {
                                if (ustat) {
-                                       php_error(E_WARNING, "stream 
filter(stream.base64): invalid base64 sequence");
+                                       php_error(E_WARNING, "stream filter(%s): 
+invalid base64 sequence", thisfilter->fops->label);
                                        return 0;
                                }
                                if (6 <= pack_bcnt) {
@@ -390,7 +390,7 @@
                                }
                        } else if (ustat) {
                                if (pack_bcnt == 8 || pack_bcnt == 2) {
-                                       php_error(E_WARNING, "stream 
filter(stream.base64): unexpected end of stream");
+                                       php_error(E_WARNING, "stream filter(%s): 
+unexpected end of stream", thisfilter->fops->label);
                                        return 0;
                                }
                        }
@@ -547,7 +547,7 @@
                                unsigned int nbl = (*ps >= 'A' ? *ps - 0x37 : *ps - 
0x30);
 
                                if (nbl > 15) {
-                                       php_error(E_WARNING, "stream 
filter(stream.quoted-printable): invalid character sequence"); 
+                                       php_error(E_WARNING, "stream filter(%s): 
+invalid character sequence", thisfilter->fops->label); 
                                        return 0;
                                }
                                v = (v << 4) | nbl;



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

Reply via email to