[PHP-CVS] cvs: php-src /ext/sqlite sqlite.c

[Marcus Boerger]

helly           Mon Aug 25 16:55:15 2003 EDT

  Modified files:              
    /php-src/ext/sqlite sqlite.c 
  Log:
  Update exception code
  
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.83 php-src/ext/sqlite/sqlite.c:1.84
--- php-src/ext/sqlite/sqlite.c:1.83    Sun Aug 17 11:43:41 2003
+++ php-src/ext/sqlite/sqlite.c Mon Aug 25 16:55:14 2003
@@ -17,7 +17,7 @@
    |          Marcus Boerger <[EMAIL PROTECTED]>                              |
    +----------------------------------------------------------------------+
 
-   $Id: sqlite.c,v 1.83 2003/08/17 15:43:41 helly Exp $ 
+   $Id: sqlite.c,v 1.84 2003/08/25 20:55:14 helly Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -119,19 +119,7 @@
 
 #define SQLITE_THROW(message) \
        PG(suppress_errors) = 0; \
-       EG(exception) = sqlite_instanciate(sqlite_ce_exception, NULL TSRMLS_CC); \
-       { \
-               zval *tmp; \
-               MAKE_STD_ZVAL(tmp); \
-               ZVAL_STRING(tmp, message, 1); \
-               zend_hash_update(Z_OBJPROP_P(EG(exception)), "message", 
sizeof("message"), (void **) message, sizeof(zval *), NULL); \
-               MAKE_STD_ZVAL(tmp); \
-               ZVAL_STRING(tmp, zend_get_executed_filename(TSRMLS_C), 1); \
-               zend_hash_update(Z_OBJPROP_P(EG(exception)), "file", sizeof("file"), 
(void **) &tmp, sizeof(zval *), NULL); \
-               MAKE_STD_ZVAL(tmp); \
-               ZVAL_LONG(tmp, zend_get_executed_lineno(TSRMLS_C)); \
-               zend_hash_update(Z_OBJPROP_P(EG(exception)), "line", sizeof("line"), 
(void **) &tmp, sizeof(zval *), NULL); \
-       }
+       EG(exception) = zend_throw_exception(sqlite_ce_exception, message, 0 
TSRMLS_CC);
 
 struct php_sqlite_result {
        struct php_sqlite_db *db;
@@ -950,7 +938,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.83 2003/08/17 15:43:41 helly Exp $");
+       php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " 
$Id: sqlite.c,v 1.84 2003/08/25 20:55:14 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();
@@ -1115,7 +1103,7 @@
        zval *errmsg = NULL;
        zval *object = getThis();
 
-       php_set_error_handling(object ? EH_THROW : EH_NORMAL, 
zend_exception_get_default() TSRMLS_CC);
+       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 CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php