diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /ext/mysqli/mysqli_exception.c | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'ext/mysqli/mysqli_exception.c')
| -rw-r--r-- | ext/mysqli/mysqli_exception.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/mysqli/mysqli_exception.c b/ext/mysqli/mysqli_exception.c index ec86b9d740..5a8f84c2bc 100644 --- a/ext/mysqli/mysqli_exception.c +++ b/ext/mysqli/mysqli_exception.c @@ -36,7 +36,7 @@ const zend_function_entry mysqli_exception_methods[] = { }; /* }}} */ -void php_mysqli_throw_sql_exception(char *sqlstate, int errorno TSRMLS_DC, char *format, ...) +void php_mysqli_throw_sql_exception(char *sqlstate, int errorno, char *format, ...) { zval sql_ex; va_list arg; @@ -47,7 +47,7 @@ void php_mysqli_throw_sql_exception(char *sqlstate, int errorno TSRMLS_DC, char va_end(arg);; if (!(MyG(report_mode) & MYSQLI_REPORT_STRICT)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "(%s/%d): %s", sqlstate, errorno, message); + php_error_docref(NULL, E_WARNING, "(%s/%d): %s", sqlstate, errorno, message); efree(message); return; } @@ -56,21 +56,21 @@ void php_mysqli_throw_sql_exception(char *sqlstate, int errorno TSRMLS_DC, char if (message) { zend_update_property_string(mysqli_exception_class_entry, &sql_ex, "message", sizeof("message") - 1, - message TSRMLS_CC); + message); } if (sqlstate) { zend_update_property_string(mysqli_exception_class_entry, &sql_ex, "sqlstate", sizeof("sqlstate") - 1, - sqlstate TSRMLS_CC); + sqlstate); } else { zend_update_property_string(mysqli_exception_class_entry, &sql_ex, "sqlstate", sizeof("sqlstate") - 1, - "00000" TSRMLS_CC); + "00000"); } efree(message); - zend_update_property_long(mysqli_exception_class_entry, &sql_ex, "code", sizeof("code") - 1, errorno TSRMLS_CC); + zend_update_property_long(mysqli_exception_class_entry, &sql_ex, "code", sizeof("code") - 1, errorno); - zend_throw_exception_object(&sql_ex TSRMLS_CC); + zend_throw_exception_object(&sql_ex); } /* |