diff options
| author | Andrey Hristov <andrey@php.net> | 2014-04-10 16:49:13 +0300 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2014-04-10 16:49:13 +0300 |
| commit | 090c3e87c0449e6eadf83815bb57c8a6eff4b56e (patch) | |
| tree | 946fdc55ed17d2dc07a99b388565cc96197026dd /ext/pdo_firebird | |
| parent | 63791d055ad64762c3f63e08ca7ad8ba1f44e0ab (diff) | |
| parent | 3204ad5858a5abc50b11b8527d22c82eb07a80cc (diff) | |
| download | php-git-090c3e87c0449e6eadf83815bb57c8a6eff4b56e.tar.gz | |
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Conflicts:
ext/mysqli/tests/mysqli_begin_transaction.phpt
Diffstat (limited to 'ext/pdo_firebird')
| -rw-r--r-- | ext/pdo_firebird/firebird_driver.c | 8 | ||||
| -rw-r--r-- | ext/pdo_firebird/pdo_firebird.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c index aa5e795594..72595de9f1 100644 --- a/ext/pdo_firebird/firebird_driver.c +++ b/ext/pdo_firebird/firebird_driver.c @@ -607,14 +607,14 @@ static int firebird_handle_get_attribute(pdo_dbh_t *dbh, long attr, zval *val TS static int pdo_firebird_fetch_error_func(pdo_dbh_t *dbh, pdo_stmt_t *stmt, zval *info TSRMLS_DC) /* {{{ */ { pdo_firebird_db_handle *H = (pdo_firebird_db_handle *)dbh->driver_data; - ISC_STATUS *s = H->isc_status; + const ISC_STATUS *s = H->isc_status; char buf[400]; long i = 0, l, sqlcode = isc_sqlcode(s); if (sqlcode) { add_next_index_long(info, sqlcode); - while ((l = isc_interprete(&buf[i],&s))) { + while ((sizeof(buf)>(i+2))&&(l = fb_interpret(&buf[i],(sizeof(buf)-i-2),&s))) { i += l; strcpy(&buf[i++], " "); } @@ -697,8 +697,8 @@ static int pdo_firebird_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRM if (!dbh->methods) { char errmsg[512]; - ISC_STATUS *s = H->isc_status; - isc_interprete(errmsg, &s); + const ISC_STATUS *s = H->isc_status; + fb_interpret(errmsg, sizeof(errmsg),&s); zend_throw_exception_ex(php_pdo_get_exception(), H->isc_status[1] TSRMLS_CC, "SQLSTATE[%s] [%d] %s", "HY000", H->isc_status[1], errmsg); } diff --git a/ext/pdo_firebird/pdo_firebird.c b/ext/pdo_firebird/pdo_firebird.c index c512004b2c..9de9048859 100644 --- a/ext/pdo_firebird/pdo_firebird.c +++ b/ext/pdo_firebird/pdo_firebird.c @@ -91,7 +91,7 @@ PHP_MSHUTDOWN_FUNCTION(pdo_firebird) /* {{{ */ PHP_MINFO_FUNCTION(pdo_firebird) /* {{{ */ { php_info_print_table_start(); - php_info_print_table_header(2, "PDO Driver for Firebird/InterBase", "enabled"); + php_info_print_table_header(2, "PDO Driver for Firebird", "enabled"); php_info_print_table_end(); } /* }}} */ |