diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-06-21 16:00:37 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-06-21 16:00:37 +0300 |
| commit | 16160386982a86e6ec7969c6c89707d38228f19e (patch) | |
| tree | 47052539a23ab7d6d2cf79392dd1e47de67bb2f1 /ext/pdo | |
| parent | 67e23f4be3c01a389043ee97b98d6bcc703d3557 (diff) | |
| download | php-git-16160386982a86e6ec7969c6c89707d38228f19e.tar.gz | |
Added ZEND_ATTRIBUTE_FORMAT to some middind functions.
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.
Diffstat (limited to 'ext/pdo')
| -rw-r--r-- | ext/pdo/pdo.c | 2 | ||||
| -rw-r--r-- | ext/pdo/pdo_dbh.c | 2 | ||||
| -rw-r--r-- | ext/pdo/pdo_stmt.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c index e0fc9d74f2..c6b9ebdcdc 100644 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c @@ -159,7 +159,7 @@ static PHP_GINIT_FUNCTION(pdo) PDO_API int php_pdo_register_driver(pdo_driver_t *driver) /* {{{ */ { if (driver->api_version != PDO_DRIVER_API) { - zend_error(E_ERROR, "PDO: driver %s requires PDO API version %pd; this is PDO version %d", + zend_error(E_ERROR, "PDO: driver %s requires PDO API version " ZEND_ULONG_FMT "; this is PDO version %d", driver->driver_name, driver->api_version, PDO_DRIVER_API); return FAILURE; } diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index 624281c18b..ffb1b6ef03 100644 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c @@ -141,7 +141,7 @@ PDO_API void pdo_handle_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt) /* {{{ */ } if (supp) { - message = strpprintf(0, "SQLSTATE[%s]: %s: %ld %s", *pdo_err, msg, native_code, supp); + message = strpprintf(0, "SQLSTATE[%s]: %s: " ZEND_LONG_FMT " %s", *pdo_err, msg, native_code, supp); } else { message = strpprintf(0, "SQLSTATE[%s]: %s", *pdo_err, msg); } diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index c2f3c13399..bd8a054718 100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -2123,10 +2123,10 @@ static PHP_METHOD(PDOStatement, debugDumpParams) php_stream_printf(out, "Key: Name: [%zd] %.*s\n", ZSTR_LEN(key), (int) ZSTR_LEN(key), ZSTR_VAL(key)); } else { - php_stream_printf(out, "Key: Position #%pd:\n", num); + php_stream_printf(out, "Key: Position #" ZEND_ULONG_FMT ":\n", num); } - php_stream_printf(out, "paramno=%pd\nname=[%zd] \"%.*s\"\nis_param=%d\nparam_type=%d\n", + php_stream_printf(out, "paramno=" ZEND_LONG_FMT "\nname=[%zd] \"%.*s\"\nis_param=%d\nparam_type=%d\n", param->paramno, param->name ? ZSTR_LEN(param->name) : 0, param->name ? (int) ZSTR_LEN(param->name) : 0, param->name ? ZSTR_VAL(param->name) : "", param->is_param, |