Fix a number of format issues

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index d981773b4567510e7cc5e4089fb5055f7bc4df6c..5cddebd2a467f39247e4c079f9894ac393290f66 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1305,7 +1305,7 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z
 
                if (UNEXPECTED(offset < 0) || UNEXPECTED(Z_STRLEN_P(container) <= offset)) {
                        if (type != BP_VAR_IS) {
-                               zend_error(E_NOTICE, "Uninitialized string offset: %ld", offset);
+                               zend_error(E_NOTICE, "Uninitialized string offset: %pd", offset);
                        }
                        ZVAL_EMPTY_STRING(result);
                } else {

diff --git a/ext/dom/xml_common.h b/ext/dom/xml_common.h
index 49226c459cee854c0056bfb5ca7fed3acf2a21cf..ed3d79b8a859d528479542dcbad1255ab4828b1b 100644 (file)
--- a/ext/dom/xml_common.h
+++ b/ext/dom/xml_common.h
@@ -68,7 +68,8 @@ PHP_DOM_EXPORT xmlNodePtr dom_object_get_node(dom_object *obj);
 #define NODE_GET_OBJ(__ptr, __id, __prtype, __intern) { \
        __intern = Z_LIBXML_NODE_P(__id); \
        if (__intern->node == NULL || !(__ptr = (__prtype)__intern->node->node)) { \
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", \
+                       __intern->std.ce->name->val);\
                RETURN_NULL();\
        } \
 }

diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
index 84f6bd4130132f8f1d592ffc3b27a69f8619e31d..3b58212902e49e7752b2bdbb2ed5ffa990eab577 100644 (file)
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@ -1065,7 +1065,7 @@ int gmp_import_export_validate(zend_long size, zend_long options, int *order, in
 {
        if (size < 1) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING,
-                       "Word size must be positive, %ld given", size);
+                       "Word size must be positive, %pd given", size);
                return FAILURE;
        }
 

diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c
index 936428ad7b2f924c003d611f440a4e1c68983693..88df420c373dd5ff780dcc9fc1d6d0f2fa8f1e51 100644 (file)
--- a/ext/pdo/pdo.c
+++ b/ext/pdo/pdo.c
@@ -179,7 +179,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 %ld; this is PDO version %d",
+               zend_error(E_ERROR, "PDO: driver %s requires PDO API version %pd; this is PDO version %d",
                        driver->driver_name, driver->api_version, PDO_DRIVER_API);
                return FAILURE;
        }

diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index afbe068e3f9eb764baf8d03d18410f693112f412..dd8b01a5b4f629558d468194f0ceada9481f73a0 100644 (file)
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -2128,7 +2128,7 @@ static PHP_METHOD(PDOStatement, debugDumpParams)
                                php_stream_printf(out TSRMLS_CC, "Key: Position #%pd:\n", num);
                        }
 
-                       php_stream_printf(out TSRMLS_CC, "paramno=%ld\nname=[%d] \"%.*s\"\nis_param=%d\nparam_type=%d\n",
+                       php_stream_printf(out TSRMLS_CC, "paramno=%pd\nname=[%d] \"%.*s\"\nis_param=%d\nparam_type=%d\n",
                                        param->paramno, param->name? param->name->len : 0, param->name? param->name->len : 0,
                                        param->name ? param->name->val : "",
                                        param->is_param,

diff --git a/ext/standard/password.c b/ext/standard/password.c
index 4fc93c34168704a308bbd60383104a91dfd78bf1..cda10cbac0d8da95e1c33f5ab89fd4f3bbd2c942 100644 (file)
--- a/ext/standard/password.c
+++ b/ext/standard/password.c
@@ -342,7 +342,7 @@ PHP_FUNCTION(password_hash)
                        
                        required_salt_len = 22;
                        hash_format = emalloc(8);
-                       sprintf(hash_format, "$2y$%02ld$", cost);
+                       sprintf(hash_format, "$2y$%02ld$", (long) cost);
                        hash_format_len = 7;
                }
                break;

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 8d9899f81fba4b33d131b65f72f4c90ed163f5b9..7e6789daaa6164e80669347588fc5e22eaea06e9 100644 (file)
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -387,7 +387,7 @@ static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
        (*p) += 2;
 
        if (datalen < 0 || (*p) + datalen >= max) {
-               zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %pd present", datalen, (zend_long)(max - (*p)));
+               zend_error(E_WARNING, "Insufficient data for unserializing - %pd required, %pd present", datalen, (zend_long)(max - (*p)));
                return 0;
        }
 

diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index 988666b2de90f16f9438545c06e5fef29c59e14c..39161353f8acb16ed40e27e6b8f41016f62eac06 100644 (file)
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -391,7 +391,7 @@ static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
        (*p) += 2;
 
        if (datalen < 0 || (*p) + datalen >= max) {
-               zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %pd present", datalen, (zend_long)(max - (*p)));
+               zend_error(E_WARNING, "Insufficient data for unserializing - %pd required, %pd present", datalen, (zend_long)(max - (*p)));
                return 0;
        }
 

diff --git a/main/main.c b/main/main.c
index 5c4cc91e44fd522de96f89cf77beba33c5c102db..fde2902d64d544ae68b4df8bdaa5dec5b3adfaeb 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1130,7 +1130,7 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
 
                if (PG(display_errors) && ((module_initialized && !PG(during_request_startup)) || (PG(display_startup_errors)))) {
                        if (PG(xmlrpc_errors)) {
-                               php_printf("<?xml version=\"1.0\"?><methodResponse><fault><value><struct><member><name>faultCode</name><value><int>%ld</int></value></member><member><name>faultString</name><value><string>%s:%s in %s on line %d</string></value></member></struct></value></fault></methodResponse>", PG(xmlrpc_error_number), error_type_str, buffer, error_filename, error_lineno);
+                               php_printf("<?xml version=\"1.0\"?><methodResponse><fault><value><struct><member><name>faultCode</name><value><int>%pd</int></value></member><member><name>faultString</name><value><string>%s:%s in %s on line %d</string></value></member></struct></value></fault></methodResponse>", PG(xmlrpc_error_number), error_type_str, buffer, error_filename, error_lineno);
                        } else {
                                char *prepend_string = INI_STR("error_prepend_string");
                                char *append_string = INI_STR("error_append_string");