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_report.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_report.c')
| -rw-r--r-- | ext/mysqli/mysqli_report.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/mysqli/mysqli_report.c b/ext/mysqli/mysqli_report.c index ceec68efb4..bdd36b557d 100644 --- a/ext/mysqli/mysqli_report.c +++ b/ext/mysqli/mysqli_report.c @@ -27,7 +27,7 @@ #include "ext/standard/info.h" #include "php_mysqli_structs.h" -extern void php_mysqli_throw_sql_exception(char *sqlstate, int errorno TSRMLS_DC, char *format, ...); +extern void php_mysqli_throw_sql_exception(char *sqlstate, int errorno, char *format, ...); /* {{{ proto bool mysqli_report(int flags) sets report level */ @@ -36,7 +36,7 @@ PHP_FUNCTION(mysqli_report) zend_long flags; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &flags) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &flags) == FAILURE) { return; } @@ -47,14 +47,14 @@ PHP_FUNCTION(mysqli_report) /* }}} */ /* {{{ void php_mysqli_report_error(char *sqlstate, int errorno, char *error) */ -void php_mysqli_report_error(const char *sqlstate, int errorno, const char *error TSRMLS_DC) +void php_mysqli_report_error(const char *sqlstate, int errorno, const char *error) { - php_mysqli_throw_sql_exception((char *)sqlstate, errorno TSRMLS_CC, "%s", error); + php_mysqli_throw_sql_exception((char *)sqlstate, errorno, "%s", error); } /* }}} */ /* {{{ void php_mysqli_report_index() */ -void php_mysqli_report_index(const char *query, unsigned int status TSRMLS_DC) { +void php_mysqli_report_index(const char *query, unsigned int status) { char index[15]; if (status & SERVER_QUERY_NO_GOOD_INDEX_USED) { @@ -64,7 +64,7 @@ void php_mysqli_report_index(const char *query, unsigned int status TSRMLS_DC) { } else { return; } - php_mysqli_throw_sql_exception("00000", 0 TSRMLS_CC, "%s used in query/prepared statement %s", index, query); + php_mysqli_throw_sql_exception("00000", 0, "%s used in query/prepared statement %s", index, query); } /* }}} */ |