cvs: php-src /ext/sqlite sqlite.c

helly Sat Sep 13 06:31:07 2003 EDT Modified files: /php-src/ext/sqlite sqlite.c Log: Make use of dedicated macro Index: php-src/ext/sqlite/sqlite.c diff -u php-src/ext/sqlite/sqlite.c:1.94 php-src/ext/sqlite/sqlite.c:1.95 --- php-src/ext/sqlite/sqlite.c:1.94 Fri Sep 5 16:09:19 2003 +++ php-src/ext/sqlite/sqlite.c Sat Sep 13 06:31:06 2003 @@ -17,7 +17,7 @@ | Marcus Boerger <helly@php.net> | +----------------------------------------------------------------------+ - $Id: sqlite.c,v 1.94 2003/09/05 20:09:19 helly Exp $ + $Id: sqlite.c,v 1.95 2003/09/13 10:31:06 helly Exp $ */ #ifdef HAVE_CONFIG_H @@ -944,7 +944,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "SQLite support", "enabled"); - php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.94 2003/09/05 20:09:19 helly Exp $"); + php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.95 2003/09/13 10:31:06 helly Exp $"); php_info_print_table_row(2, "SQLite Library", sqlite_libversion()); php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding()); php_info_print_table_end(); @@ -1112,7 +1112,7 @@ php_set_error_handling(object ? EH_THROW : EH_NORMAL, sqlite_ce_exception TSRMLS_CC); if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz/", &filename, &filename_len, &mode, &errmsg)) { - php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC); + php_std_error_handling(); return; } if (errmsg) { @@ -1124,7 +1124,7 @@ fullpath = expand_filepath(filename, NULL TSRMLS_CC); if (PG(safe_mode) && (!php_checkuid(fullpath, NULL, CHECKUID_CHECK_FILE_AND_DIR))) { - php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC); + php_std_error_handling(); efree(fullpath); if (object) { RETURN_NULL(); @@ -1134,7 +1134,7 @@ } if (php_check_open_basedir(fullpath TSRMLS_CC)) { - php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC); + php_std_error_handling(); efree(fullpath); if (object) { RETURN_NULL(); @@ -1149,7 +1149,7 @@ if (fullpath) { efree(fullpath); } - php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC); + php_std_error_handling(); } /* }}} */