iliaa Thu Jul 6 23:13:18 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/dba dba.c
/php-src/ext/dba/libinifile inifile.c
Log:
E_ERROR > E_RECOVERABLE_ERROR
http://cvs.php.net/viewvc.cgi/php-src/ext/dba/dba.c?r1=1.111.2.4.2.2&r2=1.111.2.4.2.3&diff_format=u
Index: php-src/ext/dba/dba.c
diff -u php-src/ext/dba/dba.c:1.111.2.4.2.2 php-src/ext/dba/dba.c:1.111.2.4.2.3
--- php-src/ext/dba/dba.c:1.111.2.4.2.2 Thu Jun 15 18:33:07 2006
+++ php-src/ext/dba/dba.c Thu Jul 6 23:13:18 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba.c,v 1.111.2.4.2.2 2006/06/15 18:33:07 dmitry Exp $ */
+/* $Id: dba.c,v 1.111.2.4.2.3 2006/07/06 23:13:18 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.14.2.1&r2=1.14.2.1.2.1&diff_format=u
Index: php-src/ext/dba/libinifile/inifile.c
diff -u php-src/ext/dba/libinifile/inifile.c:1.14.2.1
php-src/ext/dba/libinifile/inifile.c:1.14.2.1.2.1
--- php-src/ext/dba/libinifile/inifile.c:1.14.2.1 Sun Jan 1 12:50:05 2006
+++ php-src/ext/dba/libinifile/inifile.c Thu Jul 6 23:13:18 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: inifile.c,v 1.14.2.1 2006/01/01 12:50:05 sniper Exp $ */
+/* $Id: inifile.c,v 1.14.2.1.2.1 2006/07/06 23:13:18 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -43,7 +43,7 @@
/* {{{ inifile_version */
char *inifile_version()
{
- return "1.0, $Revision: 1.14.2.1 $";
+ return "1.0, $Revision: 1.14.2.1.2.1 $";
}
/* }}} */
@@ -538,7 +538,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
