diff options
Diffstat (limited to 'ext/pdo_sqlite/sqlite_driver.c')
| -rw-r--r-- | ext/pdo_sqlite/sqlite_driver.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c index 8e1de906a5..7c1667bb5e 100644 --- a/ext/pdo_sqlite/sqlite_driver.c +++ b/ext/pdo_sqlite/sqlite_driver.c @@ -53,7 +53,7 @@ int _pdo_sqlite_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int li switch (einfo->errcode) { case SQLITE_NOTFOUND: strncpy(*pdo_err, "42S02", sizeof("42S02")); - break; + break; case SQLITE_INTERRUPT: strncpy(*pdo_err, "01002", sizeof("01002")); @@ -66,7 +66,7 @@ int _pdo_sqlite_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int li case SQLITE_TOOBIG: strncpy(*pdo_err, "22001", sizeof("22001")); break; - + case SQLITE_CONSTRAINT: strncpy(*pdo_err, "23000", sizeof("23000")); break; @@ -81,7 +81,7 @@ int _pdo_sqlite_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int li zend_throw_exception_ex(php_pdo_get_exception(), einfo->errcode, "SQLSTATE[%s] [%d] %s", *pdo_err, einfo->errcode, einfo->errmsg); } - + return einfo->errcode; } /* }}} */ @@ -155,7 +155,7 @@ static void pdo_sqlite_cleanup_callbacks(pdo_sqlite_db_handle *H) static int sqlite_handle_closer(pdo_dbh_t *dbh) /* {{{ */ { pdo_sqlite_db_handle *H = (pdo_sqlite_db_handle *)dbh->driver_data; - + if (H) { pdo_sqlite_error_info *einfo = &H->einfo; @@ -223,7 +223,7 @@ static char *pdo_sqlite_last_insert_id(pdo_dbh_t *dbh, const char *name, unsigne { pdo_sqlite_db_handle *H = (pdo_sqlite_db_handle *)dbh->driver_data; char *id; - + id = php_pdo_int64_to_str(sqlite3_last_insert_rowid(H->db)); *len = strlen(id); return id; @@ -287,9 +287,9 @@ static int pdo_sqlite_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return case PDO_ATTR_SERVER_VERSION: ZVAL_STRING(return_value, (char *)sqlite3_libversion()); break; - + default: - return 0; + return 0; } return 1; @@ -318,13 +318,13 @@ static int do_callback(struct pdo_sqlite_fci *fc, zval *cb, int ret; int fake_argc; zend_reference *agg_context = NULL; - + if (is_agg) { is_agg = 2; } - + fake_argc = argc + is_agg; - + fc->fci.size = sizeof(fc->fci); fc->fci.function_table = EG(function_table); ZVAL_COPY_VALUE(&fc->fci.function_name, cb); @@ -332,7 +332,7 @@ static int do_callback(struct pdo_sqlite_fci *fc, zval *cb, fc->fci.object = NULL; fc->fci.retval = &retval; fc->fci.param_count = fake_argc; - + /* build up the params */ if (fake_argc) { @@ -353,7 +353,7 @@ static int do_callback(struct pdo_sqlite_fci *fc, zval *cb, } ZVAL_LONG(&zargs[1], sqlite3_aggregate_count(context)); } - + for (i = 0; i < argc; i++) { /* get the value */ switch (sqlite3_value_type(argv[i])) { @@ -528,7 +528,7 @@ static PHP_METHOD(SQLite, sqliteCreateFunction) &func_name, &func_name_len, &callback, &argc)) { RETURN_FALSE; } - + dbh = Z_PDO_DBH_P(getThis()); PDO_CONSTRUCT_CHECK; @@ -538,7 +538,7 @@ static PHP_METHOD(SQLite, sqliteCreateFunction) RETURN_FALSE; } zend_string_release(cbname); - + H = (pdo_sqlite_db_handle *)dbh->driver_data; func = (struct pdo_sqlite_func*)ecalloc(1, sizeof(*func)); @@ -547,9 +547,9 @@ static PHP_METHOD(SQLite, sqliteCreateFunction) func, php_sqlite3_func_callback, NULL, NULL); if (ret == SQLITE_OK) { func->funcname = estrdup(func_name); - + ZVAL_COPY(&func->func, callback); - + func->argc = argc; func->next = H->funcs; @@ -581,7 +581,7 @@ static PHP_METHOD(SQLite, sqliteCreateFunction) The return value of this function will be used as the return value for this aggregate UDF. */ - + static PHP_METHOD(SQLite, sqliteCreateAggregate) { struct pdo_sqlite_func *func; @@ -598,7 +598,7 @@ static PHP_METHOD(SQLite, sqliteCreateAggregate) &func_name, &func_name_len, &step_callback, &fini_callback, &argc)) { RETURN_FALSE; } - + dbh = Z_PDO_DBH_P(getThis()); PDO_CONSTRUCT_CHECK; @@ -614,7 +614,7 @@ static PHP_METHOD(SQLite, sqliteCreateAggregate) RETURN_FALSE; } zend_string_release(cbname); - + H = (pdo_sqlite_db_handle *)dbh->driver_data; func = (struct pdo_sqlite_func*)ecalloc(1, sizeof(*func)); @@ -623,11 +623,11 @@ static PHP_METHOD(SQLite, sqliteCreateAggregate) func, NULL, php_sqlite3_func_step_callback, php_sqlite3_func_final_callback); if (ret == SQLITE_OK) { func->funcname = estrdup(func_name); - + ZVAL_COPY(&func->step, step_callback); ZVAL_COPY(&func->fini, fini_callback); - + func->argc = argc; func->next = H->funcs; @@ -790,7 +790,7 @@ static int pdo_sqlite_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* {{ char *filename; H = pecalloc(1, sizeof(pdo_sqlite_db_handle), dbh->is_persistent); - + H->einfo.errcode = 0; H->einfo.errmsg = NULL; dbh->driver_data = H; @@ -825,10 +825,10 @@ static int pdo_sqlite_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* {{ dbh->max_escaped_char_length = 2; ret = 1; - + cleanup: dbh->methods = &sqlite_methods; - + return ret; } /* }}} */ |