iliaa Thu Jul 6 23:13:42 2006 UTC
Modified files:
/php-src/ext/dba dba.c
/php-src/ext/dba/libinifile inifile.c
Log:
MFB: E_ERROR > E_RECOVERABLE_ERROR
http://cvs.php.net/viewvc.cgi/php-src/ext/dba/dba.c?r1=1.120&r2=1.121&diff_format=u
Index: php-src/ext/dba/dba.c
diff -u php-src/ext/dba/dba.c:1.120 php-src/ext/dba/dba.c:1.121
--- php-src/ext/dba/dba.c:1.120 Tue Jun 13 13:12:18 2006
+++ php-src/ext/dba/dba.c Thu Jul 6 23:13:41 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba.c,v 1.120 2006/06/13 13:12:18 dmitry Exp $ */
+/* $Id: dba.c,v 1.121 2006/07/06 23:13:41 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -227,7 +227,7 @@
size_t len;
if (zend_hash_num_elements(Z_ARRVAL_PP(key)) != 2) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Key does not
have exactly two elements: (key, name)");
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR,
"Key does not have exactly two elements: (key, name)");
return -1;
}
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(key), &pos);
http://cvs.php.net/viewvc.cgi/php-src/ext/dba/libinifile/inifile.c?r1=1.17&r2=1.18&diff_format=u
Index: php-src/ext/dba/libinifile/inifile.c
diff -u php-src/ext/dba/libinifile/inifile.c:1.17
php-src/ext/dba/libinifile/inifile.c:1.18
--- php-src/ext/dba/libinifile/inifile.c:1.17 Thu May 11 20:10:29 2006
+++ php-src/ext/dba/libinifile/inifile.c Thu Jul 6 23:13:41 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: inifile.c,v 1.17 2006/05/11 20:10:29 helly Exp $ */
+/* $Id: inifile.c,v 1.18 2006/07/06 23:13:41 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -42,7 +42,7 @@
/* {{{ inifile_version */
char *inifile_version()
{
- return "1.0, $Revision: 1.17 $";
+ return "1.0, $Revision: 1.18 $";
}
/* }}} */
@@ -537,7 +537,7 @@
php_stream_seek(fp_tmp, 0, SEEK_SET);
php_stream_seek(dba->fp, 0, SEEK_END);
if (!php_stream_copy_to_stream(fp_tmp, dba->fp,
PHP_STREAM_COPY_ALL)) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR,
"Could not copy from temporary stream - ini file truncated");
+ php_error_docref(NULL TSRMLS_CC,
E_RECOVERABLE_ERROR, "Could not copy from temporary stream - ini file
truncated");
ret = FAILURE;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
