helly           Fri Nov  1 09:15:24 2002 EDT

  Modified files:              
    /php4/ext/dba       dba.c 
  Log:
  php_error -> php_error_docref
  
  
Index: php4/ext/dba/dba.c
diff -u php4/ext/dba/dba.c:1.46 php4/ext/dba/dba.c:1.47
--- php4/ext/dba/dba.c:1.46     Fri Oct 25 06:06:35 2002
+++ php4/ext/dba/dba.c  Fri Nov  1 09:15:24 2002
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dba.c,v 1.46 2002/10/25 10:06:35 helly Exp $ */
+/* $Id: dba.c,v 1.47 2002/11/01 14:15:24 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -130,7 +130,7 @@
 /* check whether the user has write access */
 #define DBA_WRITE_CHECK \
        if(info->mode != DBA_WRITER && info->mode != DBA_TRUNC && info->mode != 
DBA_CREAT) { \
-               php_error(E_WARNING, "%s(): you cannot perform a modification to a 
database without proper access", get_active_function_name(TSRMLS_C)); \
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "You cannot perform a 
+modification to a database without proper access"); \
                RETURN_FALSE; \
        }
 
@@ -313,7 +313,7 @@
        for (hptr = handler; hptr->name && strcasecmp(hptr->name, 
Z_STRVAL_PP(args[2])); hptr++);
 
        if (!hptr->name) {
-               php_error(E_WARNING, "%s(): no such handler: %s", 
get_active_function_name(TSRMLS_C), Z_STRVAL_PP(args[2]));
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "No such handler: %s", 
+Z_STRVAL_PP(args[2]));
                FREENOW;
                RETURN_FALSE;
        }
@@ -332,7 +332,7 @@
                        modenr = DBA_TRUNC;
                        break;
                default:
-                       php_error(E_WARNING, "%s(): illegal DBA mode: %s", 
get_active_function_name(TSRMLS_C), Z_STRVAL_PP(args[1]));
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal DBA mode: 
+%s", Z_STRVAL_PP(args[1]));
                        FREENOW;
                        RETURN_FALSE;
        }
@@ -347,7 +347,7 @@
 
        if (hptr->open(info TSRMLS_CC) != SUCCESS) {
                dba_close(info);
-               php_error(E_WARNING, "%s(): driver initialization failed", 
get_active_function_name(TSRMLS_C));
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Driver initialization 
+failed for handler: %s", Z_STRVAL_PP(args[2]));
                FREENOW;
                RETURN_FALSE;
        }



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

Reply via email to