Commit: adb1e38468dcd50219c594ff2f71bb4d27ee01a4
Author: Anatol Belski <a...@php.net> Thu, 5 Dec 2013 14:35:06 +0100
Parents: e8815370891e94de8a88af9e656a82eed968c084
Branches: str_size_and_int64
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=adb1e38468dcd50219c594ff2f71bb4d27ee01a4
Log:
integrated %pd into more ported extensions
Changed paths:
M ext/calendar/calendar.c
M ext/mysqli/mysqli_api.c
M ext/mysqli/mysqli_nonapi.c
M ext/mysqlnd/mysqlnd_bt.c
M ext/mysqlnd/mysqlnd_wireprotocol.c
M ext/mysqlnd/php_mysqlnd.c
M ext/odbc/php_odbc.c
M ext/odbc/tests/config.inc
M ext/opcache/zend_accelerator_module.c
M ext/opcache/zend_shared_alloc.c
M ext/pdo/pdo_dbh.c
M ext/pdo/pdo_stmt.c
M ext/pdo_pgsql/pgsql_driver.c
M ext/pdo_pgsql/pgsql_statement.c
M ext/pgsql/tests/config.inc
M ext/phar/func_interceptors.c
M ext/simplexml/simplexml.c
M ext/snmp/snmp.c
M ext/soap/php_encoding.c
M ext/soap/php_http.c
M ext/soap/soap.c
M ext/sockets/conversions.c
M ext/sockets/multicast.c
M ext/sockets/sendrecvmsg.c
M ext/sockets/sockets.c
M ext/standard/math.c
M ext/standard/metaphone.c
M ext/wddx/wddx.c
M ext/xmlrpc/xmlrpc-epi-php.c
M ext/zip/php_zip.c
M ext/zlib/zlib_filter.c
diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c
index efdc58e..be9e73c 100644
--- a/ext/calendar/calendar.c
+++ b/ext/calendar/calendar.c
@@ -313,7 +313,7 @@ PHP_FUNCTION(cal_info)
if (cal != -1 && (cal < 0 || cal >= CAL_NUM_CALS)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar
ID %ld.", cal);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar
ID %pd.", cal);
RETURN_FALSE;
}
@@ -335,7 +335,7 @@ PHP_FUNCTION(cal_days_in_month)
}
if (cal < 0 || cal >= CAL_NUM_CALS) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar
ID %ld.", cal);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar
ID %pd.", cal);
RETURN_FALSE;
}
@@ -377,7 +377,7 @@ PHP_FUNCTION(cal_to_jd)
}
if (cal < 0 || cal >= CAL_NUM_CALS) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar
ID %ld.", cal);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar
ID %pd.", cal);
RETURN_FALSE;
}
@@ -399,7 +399,7 @@ PHP_FUNCTION(cal_from_jd)
}
if (cal < 0 || cal >= CAL_NUM_CALS) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar
ID %ld", cal);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar
ID %pd", cal);
RETURN_FALSE;
}
calendar = &cal_conversion_table[cal];
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 0722c78..b78fc29 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -2303,7 +2303,7 @@ PHP_FUNCTION(mysqli_stmt_attr_set)
MYSQLI_FETCH_RESOURCE_STMT(stmt, &mysql_stmt, MYSQLI_STATUS_VALID);
if (mode_in < 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "mode should be
non-negative, %ld passed", mode_in);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "mode should be
non-negative, %pd passed", mode_in);
RETURN_FALSE;
}
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index 525f4f4..e409e25 100644
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -202,14 +202,14 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS,
zend_bool is_real_conne
}
}
if (MyG(max_links) != -1 && MyG(num_links) >= MyG(max_links)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open
links (%ld)", MyG(num_links));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open
links (%pd)", MyG(num_links));
goto err;
}
if (persistent && MyG(max_persistent) != -1 &&
(MyG(num_active_persistent) + MyG(num_inactive_persistent))>=
MyG(max_persistent))
{
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open
persistent links (%ld)",
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open
persistent links (%pd)",
MyG(num_active_persistent) + MyG(num_inactive_persistent));
goto err;
}
@@ -1108,7 +1108,7 @@ PHP_FUNCTION(mysqli_begin_transaction)
}
MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID);
if (flags < 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid value for
parameter flags (%ld)", flags);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid value for
parameter flags (%pd)", flags);
err = TRUE;
}
if (!name_len) {
diff --git a/ext/mysqlnd/mysqlnd_bt.c b/ext/mysqlnd/mysqlnd_bt.c
index 8648796..c06f561 100644
--- a/ext/mysqlnd/mysqlnd_bt.c
+++ b/ext/mysqlnd/mysqlnd_bt.c
@@ -177,7 +177,7 @@ mysqlnd_build_trace_string(zval **frame TSRMLS_DC, int
num_args, va_list args, z
line = 0;
}
s_tmp = emalloc(Z_STRSIZE_PP(file) + MAX_LENGTH_OF_LONG + 4 +
1);
- sprintf(s_tmp, "%s(%ld): ", Z_STRVAL_PP(file), line);
+ sprintf(s_tmp, "%s(%pd): ", Z_STRVAL_PP(file), line);
TRACE_APPEND_STRL(s_tmp, strlen(s_tmp));
efree(s_tmp);
} else {
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c
b/ext/mysqlnd/mysqlnd_wireprotocol.c
index ebfd03b..b71b106 100644
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -714,7 +714,7 @@ php_mysqlnd_auth_response_read(void * _packet,
MYSQLND_CONN_DATA * conn TSRMLS_D
packet->message_len = 0;
}
- DBG_INF_FMT("OK packet: aff_rows=%lld last_ins_id=%ld
server_status=%u warnings=%u",
+ DBG_INF_FMT("OK packet: aff_rows=%lld last_ins_id=%pd
server_status=%u warnings=%u",
packet->affected_rows,
packet->last_insert_id, packet->server_status,
packet->warning_count);
}
diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c
index b374b84..3acd69b 100644
--- a/ext/mysqlnd/php_mysqlnd.c
+++ b/ext/mysqlnd/php_mysqlnd.c
@@ -150,11 +150,11 @@ PHP_MINFO_FUNCTION(mysqlnd)
#else
"not
supported");
#endif
- snprintf(buf, sizeof(buf), "%ld", MYSQLND_G(net_cmd_buffer_size));
+ snprintf(buf, sizeof(buf), "%pd", MYSQLND_G(net_cmd_buffer_size));
php_info_print_table_row(2, "Command buffer size", buf);
- snprintf(buf, sizeof(buf), "%ld", MYSQLND_G(net_read_buffer_size));
+ snprintf(buf, sizeof(buf), "%pd", MYSQLND_G(net_read_buffer_size));
php_info_print_table_row(2, "Read buffer size", buf);
- snprintf(buf, sizeof(buf), "%ld", MYSQLND_G(net_read_timeout));
+ snprintf(buf, sizeof(buf), "%pd", MYSQLND_G(net_read_timeout));
php_info_print_table_row(2, "Read timeout", buf);
php_info_print_table_row(2, "Collecting statistics",
MYSQLND_G(collect_statistics)? "Yes":"No");
php_info_print_table_row(2, "Collecting memory statistics",
MYSQLND_G(collect_memory_statistics)? "Yes":"No");
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 424388a..0fa1b7a 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -846,9 +846,9 @@ PHP_MINFO_FUNCTION(odbc)
php_info_print_table_start();
php_info_print_table_header(2, "ODBC Support", "enabled");
- snprintf(buf, sizeof(buf), "%ld", ODBCG(num_persistent));
+ snprintf(buf, sizeof(buf), "%pd", ODBCG(num_persistent));
php_info_print_table_row(2, "Active Persistent Links", buf);
- snprintf(buf, sizeof(buf), "%ld", ODBCG(num_links));
+ snprintf(buf, sizeof(buf), "%pd", ODBCG(num_links));
php_info_print_table_row(2, "Active Links", buf);
php_info_print_table_row(2, "ODBC library", PHP_ODBC_TYPE);
#ifndef PHP_WIN32
diff --git a/ext/odbc/tests/config.inc b/ext/odbc/tests/config.inc
index a88eea4..14dff79 100644
--- a/ext/odbc/tests/config.inc
+++ b/ext/odbc/tests/config.inc
@@ -3,6 +3,6 @@
putenv('ODBCINI=/etc/odbc.ini');
putenv('ODBCSYSINI=/etc');
-$dsn = 'myodbc3';
-$user = 'root';
+$dsn = 'Driver={Microsoft Access Driver (*.mdb,
*.accdb)};Dbq=d:\php_test.accdb;';
+$user = '';
$pass = '';
diff --git a/ext/opcache/zend_accelerator_module.c
b/ext/opcache/zend_accelerator_module.c
index 2b98c3d..9f56d6d 100644
--- a/ext/opcache/zend_accelerator_module.c
+++ b/ext/opcache/zend_accelerator_module.c
@@ -428,25 +428,25 @@ void zend_accel_info(ZEND_MODULE_INFO_FUNC_ARGS)
php_info_print_table_row(2, "Shared memory model",
zend_accel_get_shared_model());
snprintf(buf, sizeof(buf), "%ld", ZCSG(hits));
php_info_print_table_row(2, "Cache hits", buf);
- snprintf(buf, sizeof(buf), "%ld",
ZSMMG(memory_exhausted)?ZCSG(misses):ZCSG(misses)-ZCSG(blacklist_misses));
+ snprintf(buf, sizeof(buf), "%pd",
ZSMMG(memory_exhausted)?ZCSG(misses):ZCSG(misses)-ZCSG(blacklist_misses));
php_info_print_table_row(2, "Cache misses", buf);
snprintf(buf, sizeof(buf), "%ld",
ZCG(accel_directives).memory_consumption-zend_shared_alloc_get_free_memory()-ZSMMG(wasted_shared_memory));
php_info_print_table_row(2, "Used memory", buf);
- snprintf(buf, sizeof(buf), "%ld",
zend_shared_alloc_get_free_memory());
+ snprintf(buf, sizeof(buf), "%pd",
zend_shared_alloc_get_free_memory());
php_info_print_table_row(2, "Free memory", buf);
- snprintf(buf, sizeof(buf), "%ld",
ZSMMG(wasted_shared_memory));
+ snprintf(buf, sizeof(buf), "%pd",
ZSMMG(wasted_shared_memory));
php_info_print_table_row(2, "Wasted memory", buf);
snprintf(buf, sizeof(buf), "%ld",
ZCSG(hash).num_direct_entries);
php_info_print_table_row(2, "Cached scripts", buf);
snprintf(buf, sizeof(buf), "%ld",
ZCSG(hash).num_entries);
php_info_print_table_row(2, "Cached keys", buf);
- snprintf(buf, sizeof(buf), "%ld",
ZCSG(hash).max_num_entries);
+ snprintf(buf, sizeof(buf), "%pd",
ZCSG(hash).max_num_entries);
php_info_print_table_row(2, "Max keys", buf);
- snprintf(buf, sizeof(buf), "%ld", ZCSG(oom_restarts));
+ snprintf(buf, sizeof(buf), "%pd", ZCSG(oom_restarts));
php_info_print_table_row(2, "OOM restarts", buf);
- snprintf(buf, sizeof(buf), "%ld", ZCSG(hash_restarts));
+ snprintf(buf, sizeof(buf), "%pd", ZCSG(hash_restarts));
php_info_print_table_row(2, "Hash keys restarts", buf);
- snprintf(buf, sizeof(buf), "%ld",
ZCSG(manual_restarts));
+ snprintf(buf, sizeof(buf), "%pd",
ZCSG(manual_restarts));
php_info_print_table_row(2, "Manual restarts", buf);
}
}
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c
index cf4e0ff..204aaea 100644
--- a/ext/opcache/zend_shared_alloc.c
+++ b/ext/opcache/zend_shared_alloc.c
@@ -101,7 +101,7 @@ void zend_shared_alloc_create_lock(void)
static void no_memory_bailout(size_t allocate_size, char *error)
{
- zend_accel_error(ACCEL_LOG_FATAL, "Unable to allocate shared memory
segment of %ld bytes: %s: %s (%d)", allocate_size, error?error:"unknown",
strerror(errno), errno );
+ zend_accel_error(ACCEL_LOG_FATAL, "Unable to allocate shared memory
segment of %zd bytes: %s: %s (%d)", allocate_size, error?error:"unknown",
strerror(errno), errno );
}
static void copy_shared_segments(void *to, void *from, int count, int size)
@@ -288,7 +288,7 @@ static size_t zend_shared_alloc_get_largest_free_block(void)
#define MIN_FREE_MEMORY 64*1024
#define SHARED_ALLOC_FAILED() do { \
- zend_accel_error(ACCEL_LOG_WARNING, "Not enough free shared
space to allocate %ld bytes (%ld bytes free)", (long)size,
(long)ZSMMG(shared_free)); \
+ zend_accel_error(ACCEL_LOG_WARNING, "Not enough free shared
space to allocate %pd bytes (%pd bytes free)", (zend_int_t)size,
(zend_int_t)ZSMMG(shared_free)); \
if (zend_shared_alloc_get_largest_free_block() <
MIN_FREE_MEMORY) { \
ZSMMG(memory_exhausted) = 1; \
} \
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index d08dcb5..2d64710 100644
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -144,7 +144,7 @@ PDO_API void pdo_handle_error(pdo_dbh_t *dbh, pdo_stmt_t
*stmt TSRMLS_DC) /* {{{
}
if (supp) {
- spprintf(&message, 0, "SQLSTATE[%s]: %s: %ld %s", *pdo_err,
msg, native_code, supp);
+ spprintf(&message, 0, "SQLSTATE[%s]: %s: %pd %s", *pdo_err,
msg, native_code, supp);
} else {
spprintf(&message, 0, "SQLSTATE[%s]: %s", *pdo_err, msg);
}
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 1db3dda..7301c7f 100644
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -2175,7 +2175,7 @@ static PHP_METHOD(PDOStatement, debugDumpParams)
res = zend_hash_get_current_key_ex(stmt->bound_params,
&str, &len, &num, 0, &pos);
if (res == HASH_KEY_IS_LONG) {
- php_stream_printf(out TSRMLS_CC, "Key: Position
#%ld:\n", num);
+ php_stream_printf(out TSRMLS_CC, "Key: Position
#%pd:\n", num);
} else if (res == HASH_KEY_IS_STRING) {
php_stream_printf(out TSRMLS_CC, "Key: Name:
[%d] %.*s\n", len, len, str);
}
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c
index fbcd25c..5f5c5de 100644
--- a/ext/pdo_pgsql/pgsql_driver.c
+++ b/ext/pdo_pgsql/pgsql_driver.c
@@ -1182,13 +1182,13 @@ static int pdo_pgsql_handle_factory(pdo_dbh_t *dbh,
zval *driver_options TSRMLS_
/* support both full connection string & connection string + login
and/or password */
if (dbh->username && dbh->password) {
- spprintf(&conn_str, 0, "%s user=%s password=%s
connect_timeout=%ld", dbh->data_source, dbh->username, dbh->password,
connect_timeout);
+ spprintf(&conn_str, 0, "%s user=%s password=%s
connect_timeout=%pd", dbh->data_source, dbh->username, dbh->password,
connect_timeout);
} else if (dbh->username) {
- spprintf(&conn_str, 0, "%s user=%s connect_timeout=%ld",
dbh->data_source, dbh->username, connect_timeout);
+ spprintf(&conn_str, 0, "%s user=%s connect_timeout=%pd",
dbh->data_source, dbh->username, connect_timeout);
} else if (dbh->password) {
- spprintf(&conn_str, 0, "%s password=%s connect_timeout=%ld",
dbh->data_source, dbh->password, connect_timeout);
+ spprintf(&conn_str, 0, "%s password=%s connect_timeout=%pd",
dbh->data_source, dbh->password, connect_timeout);
} else {
- spprintf(&conn_str, 0, "%s connect_timeout=%ld", (char *)
dbh->data_source, connect_timeout);
+ spprintf(&conn_str, 0, "%s connect_timeout=%pd", (char *)
dbh->data_source, connect_timeout);
}
H->server = PQconnectdb(conn_str);
diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c
index 3567f11..d09a0cc 100644
--- a/ext/pdo_pgsql/pgsql_statement.c
+++ b/ext/pdo_pgsql/pgsql_statement.c
@@ -395,8 +395,8 @@ static int pgsql_stmt_fetch(pdo_stmt_t *stmt,
case PDO_FETCH_ORI_PRIOR: spprintf(&ori_str, 0,
"BACKWARD"); break;
case PDO_FETCH_ORI_FIRST: spprintf(&ori_str, 0,
"FIRST"); break;
case PDO_FETCH_ORI_LAST: spprintf(&ori_str, 0,
"LAST"); break;
- case PDO_FETCH_ORI_ABS: spprintf(&ori_str, 0,
"ABSOLUTE %ld", offset); break;
- case PDO_FETCH_ORI_REL: spprintf(&ori_str, 0,
"RELATIVE %ld", offset); break;
+ case PDO_FETCH_ORI_ABS: spprintf(&ori_str, 0,
"ABSOLUTE %pd", offset); break;
+ case PDO_FETCH_ORI_REL: spprintf(&ori_str, 0,
"RELATIVE %pd", offset); break;
default:
return 0;
}
diff --git a/ext/pgsql/tests/config.inc b/ext/pgsql/tests/config.inc
index ffe31a8..9c22254 100644
--- a/ext/pgsql/tests/config.inc
+++ b/ext/pgsql/tests/config.inc
@@ -4,11 +4,11 @@
// "test" database must be existed. i.e. "createdb test" before testing
// PostgreSQL uses login name as username, user must have access to "test"
database.
-$conn_str = "host=localhost dbname=test port=5432"; // connection string
+$conn_str = "user=test password=test host=localhost dbname=test port=5432";
// connection string
$table_name = "php_pgsql_test"; // test table that will be created
$num_test_record = 1000; // Number of records to create
$table_def = "CREATE TABLE php_pgsql_test (num int, str text, bin bytea);"; //
Test table
$field_name = "num"; // For pg_field_num()
-?>
\ No newline at end of file
+?>
diff --git a/ext/phar/func_interceptors.c b/ext/phar/func_interceptors.c
index 6b83274..6cbdc3b 100644
--- a/ext/phar/func_interceptors.c
+++ b/ext/phar/func_interceptors.c
@@ -196,7 +196,7 @@ phar_it:
}
if (offset > 0 && php_stream_seek(stream, offset,
SEEK_SET) < 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Failed to seek to position %ld in the stream", offset);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Failed to seek to position %pd in the stream", offset);
php_stream_close(stream);
RETURN_FALSE;
}
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index c52f0b5..7e87ab8 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -340,7 +340,7 @@ static zval * sxe_prop_dim_read(zval *object, zval *member,
zend_bool elements,
}
if (sxe->iter.type == SXE_ITER_NONE) {
if (member && Z_LVAL_P(member) > 0) {
- php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Cannot add element %s number %ld when only 0 such
elements exist", mynode->name, Z_LVAL_P(member));
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Cannot add element %s number %pd when only 0 such
elements exist", mynode->name, Z_LVAL_P(member));
}
} else if (member) {
node = sxe_get_element_by_offset(sxe,
Z_LVAL_P(member), node, &cnt);
@@ -351,7 +351,7 @@ static zval * sxe_prop_dim_read(zval *object, zval *member,
zend_bool elements,
_node_as_zval(sxe, node, return_value,
SXE_ITER_NONE, NULL, sxe->iter.nsprefix, sxe->iter.isprefix TSRMLS_CC);
} else if (type == BP_VAR_W || type ==
BP_VAR_RW) {
if (member && cnt < Z_LVAL_P(member)) {
- php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Cannot add element %s number %ld when only %ld such
elements exist", mynode->name, Z_LVAL_P(member), cnt);
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Cannot add element %s number %pd when only %pd such
elements exist", mynode->name, Z_LVAL_P(member), cnt);
}
node = xmlNewTextChild(mynode->parent,
mynode->ns, mynode->name, NULL);
_node_as_zval(sxe, node, return_value,
SXE_ITER_NONE, NULL, sxe->iter.nsprefix, sxe->iter.isprefix TSRMLS_CC);
@@ -599,7 +599,7 @@ static int sxe_prop_dim_write(zval *object, zval *member,
zval *value, zend_bool
newnode = node;
++counter;
if (member && Z_LVAL_P(member) > 0) {
- php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Cannot add element %s number %ld when only 0 such
elements exist", mynode->name, Z_LVAL_P(member));
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Cannot add element %s number %pd when only 0 such
elements exist", mynode->name, Z_LVAL_P(member));
retval = FAILURE;
}
} else if (member) {
@@ -647,14 +647,14 @@ next_iter:
}
} else if (!member || Z_TYPE_P(member) == IS_LONG) {
if (member && cnt < Z_LVAL_P(member)) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Cannot add element %s number %ld when only %ld such elements
exist", mynode->name, Z_LVAL_P(member), cnt);
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Cannot add element %s number %pd when only %pd such elements
exist", mynode->name, Z_LVAL_P(member), cnt);
retval = FAILURE;
}
newnode = xmlNewTextChild(mynode->parent,
mynode->ns, mynode->name, value ? (xmlChar *)Z_STRVAL_P(value) : NULL);
}
} else if (attribs) {
if (Z_TYPE_P(member) == IS_LONG) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Cannot change attribute number %ld when only %d attributes exist",
Z_LVAL_P(member), nodendx);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Cannot change attribute number %pd when only %d attributes exist",
Z_LVAL_P(member), nodendx);
retval = FAILURE;
} else {
newnode = (xmlNodePtr)xmlNewProp(node, (xmlChar
*)Z_STRVAL_P(member), value ? (xmlChar *)Z_STRVAL_P(value) : NULL);
diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index 03a9f11..5833fad 100644
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -1761,7 +1761,7 @@ PHP_FUNCTION(snmp_set_valueretrieval)
SNMP_G(valueretrieval) = method;
RETURN_TRUE;
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown SNMP value
retrieval method '%ld'", method);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown SNMP value
retrieval method '%pd'", method);
RETURN_FALSE;
}
}
@@ -2218,7 +2218,7 @@ static int php_snmp_write_max_oids(php_snmp_object
*snmp_object, zval *newval TS
if (Z_LVAL_P(newval) > 0) {
snmp_object->max_oids = Z_LVAL_P(newval);
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "max_oids should be
positive integer or NULL, got %ld", Z_LVAL_P(newval));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "max_oids should be
positive integer or NULL, got %pd", Z_LVAL_P(newval));
}
if (newval == &ztmp) {
@@ -2245,7 +2245,7 @@ static int php_snmp_write_valueretrieval(php_snmp_object
*snmp_object, zval *new
if (Z_LVAL_P(newval) >= 0 && Z_LVAL_P(newval) <=
(SNMP_VALUE_LIBRARY|SNMP_VALUE_PLAIN|SNMP_VALUE_OBJECT)) {
snmp_object->valueretrieval = Z_LVAL_P(newval);
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown SNMP value
retrieval method '%ld'", Z_LVAL_P(newval));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown SNMP value
retrieval method '%pd'", Z_LVAL_P(newval));
ret = FAILURE;
}
@@ -2302,7 +2302,7 @@ static int
php_snmp_write_oid_output_format(php_snmp_object *snmp_object, zval *
snmp_object->oid_output_format = Z_LVAL_P(newval);
break;
default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown
SNMP output print format '%ld'", Z_LVAL_P(newval));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown
SNMP output print format '%pd'", Z_LVAL_P(newval));
ret = FAILURE;
break;
}
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index b3a900e..51f7eee 100644
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -2992,7 +2992,7 @@ static xmlNodePtr to_xml_datetime_ex(encodeTypePtr type,
zval *data, char *forma
ta = php_localtime_r(×tamp, &tmbuf);
/*ta = php_gmtime_r(×tamp, &tmbuf);*/
if (!ta) {
- soap_error1(E_ERROR, "Encoding: Invalid timestamp %ld",
Z_LVAL_P(data));
+ soap_error1(E_ERROR, "Encoding: Invalid timestamp %pd",
Z_LVAL_P(data));
}
buf = (char *) emalloc(buf_len);
diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c
index 6f64fe7..b19709a 100644
--- a/ext/soap/php_http.c
+++ b/ext/soap/php_http.c
@@ -636,7 +636,7 @@ try_again:
unsigned char hash[16];
PHP_MD5Init(&md5ctx);
- snprintf(cnonce, sizeof(cnonce), "%ld",
php_rand(TSRMLS_C));
+ snprintf(cnonce, sizeof(cnonce), "%pd",
php_rand(TSRMLS_C));
PHP_MD5Update(&md5ctx, (unsigned
char*)cnonce, strlen(cnonce));
PHP_MD5Final(hash, &md5ctx);
make_digest(cnonce, hash);
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 60f2ee4..6054e1a 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -925,7 +925,7 @@ PHP_METHOD(SoapFault, __toString)
zend_call_function(&fci, NULL TSRMLS_CC);
- len = spprintf(&str, 0, "SoapFault exception: [%s] %s in %s:%ld\nStack
trace:\n%s",
+ len = spprintf(&str, 0, "SoapFault exception: [%s] %s in %s:%pd\nStack
trace:\n%s",
Z_STRVAL_P(faultcode), Z_STRVAL_P(faultstring),
Z_STRVAL_P(file), Z_LVAL_P(line),
Z_STRSIZE_P(trace) ? Z_STRVAL_P(trace) : "#0 {main}\n");
@@ -1240,7 +1240,7 @@ PHP_METHOD(SoapServer, setPersistence)
value == SOAP_PERSISTENCE_REQUEST) {
service->soap_class.persistance = value;
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Tried to set persistence with bogus value (%ld)", value);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Tried to set persistence with bogus value (%pd)", value);
return;
}
} else {
diff --git a/ext/sockets/conversions.c b/ext/sockets/conversions.c
index 347de67..7710dde 100644
--- a/ext/sockets/conversions.c
+++ b/ext/sockets/conversions.c
@@ -676,7 +676,7 @@ static void from_zval_write_sun_path(const zval *path, char
*sockaddr_un_c, ser_
}
if (Z_STRSIZE_P(path) >= sizeof(saddr->sun_path)) {
do_from_zval_err(ctx, "the path is too long, the maximum
permitted "
- "length is %ld", sizeof(saddr->sun_path) - 1);
+ "length is %pd", sizeof(saddr->sun_path) - 1);
return;
}
@@ -988,8 +988,8 @@ static void to_zval_read_cmsg_data(const char *cmsghdr_c,
zval *zv, res_context
}
if (CMSG_LEN(entry->size) > cmsg->cmsg_len) {
do_to_zval_err(ctx, "the cmsghdr structure is unexpectedly
small; "
- "expected a length of at least %ld, but got
%ld",
- (long)CMSG_LEN(entry->size),
(long)cmsg->cmsg_len);
+ "expected a length of at least %pd, but got
%pd",
+ (php_int_t)CMSG_LEN(entry->size),
(php_int_t)cmsg->cmsg_len);
return;
}
@@ -1085,8 +1085,8 @@ static void from_zval_write_msghdr_buffer_size(const zval
*elem, char *msghdr_c,
}
if (lval < 0 || lval > MAX_USER_BUFF_SIZE) {
- do_from_zval_err(ctx, "the buffer size must be between 1 and
%ld; "
- "given %ld", (long)MAX_USER_BUFF_SIZE, lval);
+ do_from_zval_err(ctx, "the buffer size must be between 1 and
%pd; "
+ "given %pd", (php_int_t)MAX_USER_BUFF_SIZE,
lval);
return;
}
@@ -1263,7 +1263,7 @@ static void from_zval_write_ifindex(const zval *zv, char
*uinteger, ser_context
if (Z_TYPE_P(zv) == IS_LONG) {
if (Z_LVAL_P(zv) < 0 || Z_LVAL_P(zv) > UINT_MAX) { /* allow 0
(unspecified interface) */
do_from_zval_err(ctx, "the interface index cannot be
negative or "
- "larger than %u; given %ld", UINT_MAX,
Z_LVAL_P(zv));
+ "larger than %u; given %pd", UINT_MAX,
Z_LVAL_P(zv));
} else {
ret = (unsigned)Z_LVAL_P(zv);
}
@@ -1435,7 +1435,7 @@ void to_zval_read_fd_array(const char *data, zval *zv,
res_context *ctx)
if (**cmsg_len < data_offset) {
do_to_zval_err(ctx, "length of cmsg is smaller than its data
member "
- "offset (%ld vs %ld)", (long)**cmsg_len,
(long)data_offset);
+ "offset (%pd vs %pd)", (php_int_t)**cmsg_len,
(php_int_t)data_offset);
return;
}
num_elems = (**cmsg_len - data_offset) / sizeof(int);
diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c
index ecf3a65..f7fdb46 100644
--- a/ext/sockets/multicast.c
+++ b/ext/sockets/multicast.c
@@ -93,7 +93,7 @@ static int php_get_if_index_from_zval(zval *val, unsigned
*out TSRMLS_DC)
if (Z_LVAL_P(val) < 0 || Z_LVAL_P(val) > UINT_MAX) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"the interface index cannot be negative or
larger than %u;"
- " given %ld", UINT_MAX, Z_LVAL_P(val));
+ " given %pd", UINT_MAX, Z_LVAL_P(val));
ret = FAILURE;
} else {
*out = Z_LVAL_P(val);
diff --git a/ext/sockets/sendrecvmsg.c b/ext/sockets/sendrecvmsg.c
index 3a1d468..95416df 100644
--- a/ext/sockets/sendrecvmsg.c
+++ b/ext/sockets/sendrecvmsg.c
@@ -71,7 +71,7 @@ inline ssize_t sendmsg(int sockfd, const struct msghdr *msg,
int flags)
#define LONG_CHECK_VALID_INT(l) \
do { \
if ((l) < INT_MIN && (l) > INT_MAX) { \
- php_error_docref0(NULL TSRMLS_CC, E_WARNING, "The value
%ld does not fit inside " \
+ php_error_docref0(NULL TSRMLS_CC, E_WARNING, "The value
%pd does not fit inside " \
"the boundaries of a native integer",
(l)); \
return; \
} \
@@ -294,16 +294,16 @@ PHP_FUNCTION(socket_cmsg_space)
entry = get_ancillary_reg_entry(level, type);
if (entry == NULL) {
- php_error_docref0(NULL TSRMLS_CC, E_WARNING, "The pair level
%ld/type %ld is "
+ php_error_docref0(NULL TSRMLS_CC, E_WARNING, "The pair level
%pd/type %pd is "
"not supported by PHP", level, type);
return;
}
- if (entry->var_el_size > 0 && n > (LONG_MAX - (long)entry->size -
- (long)CMSG_SPACE(0) - 15L) / entry->var_el_size) {
+ if (entry->var_el_size > 0 && n > (PHP_INT_MAX - (php_int_t)entry->size
-
+ (php_int_t)CMSG_SPACE(0) - 15L) / entry->var_el_size) {
/* the -15 is to account for any padding CMSG_SPACE may add
after the data */
php_error_docref0(NULL TSRMLS_CC, E_WARNING, "The value for the
"
- "third argument (%ld) is too large", n);
+ "third argument (%pd) is too large", n);
return;
}
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 8b2d733..d7abad6 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -1349,12 +1349,12 @@ PHP_FUNCTION(socket_create)
&& arg1 != AF_INET6
#endif
&& arg1 != AF_INET) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid socket
domain [%ld] specified for argument 1, assuming AF_INET", arg1);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid socket
domain [%pd] specified for argument 1, assuming AF_INET", arg1);
arg1 = AF_INET;
}
if (arg2 > 10) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid socket
type [%ld] specified for argument 2, assuming SOCK_STREAM", arg2);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid socket
type [%pd] specified for argument 2, assuming SOCK_STREAM", arg2);
arg2 = SOCK_STREAM;
}
@@ -2107,12 +2107,12 @@ PHP_FUNCTION(socket_create_pair)
&& domain != AF_INET6
#endif
&& domain != AF_UNIX) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid socket
domain [%ld] specified for argument 1, assuming AF_INET", domain);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid socket
domain [%pd] specified for argument 1, assuming AF_INET", domain);
domain = AF_INET;
}
if (type > 10) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid socket
type [%ld] specified for argument 2, assuming SOCK_STREAM", type);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid socket
type [%pd] specified for argument 2, assuming SOCK_STREAM", type);
type = SOCK_STREAM;
}
diff --git a/ext/standard/math.c b/ext/standard/math.c
index 2631233..fe791cb 100644
--- a/ext/standard/math.c
+++ b/ext/standard/math.c
@@ -1074,11 +1074,11 @@ PHP_FUNCTION(base_convert)
convert_to_string_ex(number);
if (frombase < 2 || frombase > 36) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid `from
base' (%ld)", frombase);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid `from
base' (%pd)", frombase);
RETURN_FALSE;
}
if (tobase < 2 || tobase > 36) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid `to base'
(%ld)", tobase);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid `to base'
(%pd)", tobase);
RETURN_FALSE;
}
diff --git a/ext/standard/metaphone.c b/ext/standard/metaphone.c
index 57264d5..3e5adad 100644
--- a/ext/standard/metaphone.c
+++ b/ext/standard/metaphone.c
@@ -25,7 +25,7 @@
#include "php.h"
#include "php_metaphone.h"
-static int metaphone(unsigned char *word, int word_len, long max_phonemes,
char **phoned_word, int traditional);
+static int metaphone(unsigned char *word, zend_str_size_int word_len,
php_int_t max_phonemes, char **phoned_word, int traditional);
/* {{{ proto string metaphone(string text[, int phones])
Break english phrases down into their phonemes */
@@ -164,11 +164,11 @@ static char Lookahead(char *word, int how_far)
/* {{{ metaphone
*/
-static int metaphone(unsigned char *word, int word_len, long max_phonemes,
char **phoned_word, int traditional)
+static int metaphone(unsigned char *word, zend_str_size_int word_len,
php_int_t max_phonemes, char **phoned_word, int traditional)
{
int w_idx = 0; /* point in the phonization
we're at. */
int p_idx = 0; /* end of the phoned phrase */
- int max_buffer_len = 0; /* maximum length of the destination
buffer */
+ zend_str_size_int max_buffer_len = 0; /* maximum length of
the destination buffer */
/*-- Parameter checks --*/
/* Negative phoneme length is meaningless */
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 8ed2d35..c390a9d 100644
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -316,7 +316,7 @@ PS_SERIALIZER_DECODE_FUNC(wddx)
switch (hash_type) {
case HASH_KEY_IS_LONG:
- key_length = slprintf(tmp, sizeof(tmp),
"%ld", idx) + 1;
+ key_length = slprintf(tmp, sizeof(tmp),
ZEND_UINT_FMT, idx) + 1;
key = tmp;
/* fallthru */
case HASH_KEY_IS_STRING:
@@ -534,7 +534,7 @@ static void php_wddx_serialize_object(wddx_packet *packet,
zval *obj)
zend_unmangle_property_name(key, key_len-1,
&class_name, &prop_name);
php_wddx_serialize_var(packet, *ent, prop_name,
strlen(prop_name)+1 TSRMLS_CC);
} else {
- key_len = slprintf(tmp_buf, sizeof(tmp_buf),
"%ld", idx);
+ key_len = slprintf(tmp_buf, sizeof(tmp_buf),
ZEND_UINT_FMT, idx);
php_wddx_serialize_var(packet, *ent, tmp_buf,
key_len TSRMLS_CC);
}
}
@@ -606,7 +606,7 @@ static void php_wddx_serialize_array(wddx_packet *packet,
zval *arr)
if (ent_type == HASH_KEY_IS_STRING) {
php_wddx_serialize_var(packet, *ent, key,
key_len TSRMLS_CC);
} else {
- key_len = slprintf(tmp_buf, sizeof(tmp_buf),
"%ld", idx);
+ key_len = slprintf(tmp_buf, sizeof(tmp_buf),
ZEND_UINT_FMT, idx);
php_wddx_serialize_var(packet, *ent, tmp_buf,
key_len TSRMLS_CC);
}
} else {
diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
index f6e368b..49c6fc4 100644
--- a/ext/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/xmlrpc/xmlrpc-epi-php.c
@@ -594,7 +594,7 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key,
zval* in_val, int dep
char *num_str = NULL;
if (vtype != xmlrpc_vector_array) {
-
spprintf(&num_str, 0, "%ld", num_index);
+
spprintf(&num_str, 0, "%pu", num_index);
}
XMLRPC_AddValueToVector(xReturn, PHP_to_XMLRPC_worker(num_str, *pIter, depth++
TSRMLS_CC));
if (num_str) {
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index b428f21..9505f66 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -1776,7 +1776,7 @@ static void
php_zip_add_from_pattern(INTERNAL_FUNCTION_PARAMETERS, int type) /*
if (add_path) {
if ((add_path_len + file_stripped_len)
> MAXPATHLEN) {
- php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Entry name too long (max: %d, %ld given)",
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Entry name too long (max: %d, %pd given)",
MAXPATHLEN - 1, (add_path_len +
file_stripped_len));
zval_dtor(return_value);
RETURN_FALSE;
diff --git a/ext/zlib/zlib_filter.c b/ext/zlib/zlib_filter.c
index 8ccd9e1..8dfcb37 100644
--- a/ext/zlib/zlib_filter.c
+++ b/ext/zlib/zlib_filter.c
@@ -335,7 +335,7 @@ static php_stream_filter *php_zlib_filter_create(const char
*filtername, zval *f
zval_copy_ctor(&tmp);
convert_to_long(&tmp);
if (Z_LVAL(tmp) < -MAX_WBITS || Z_LVAL(tmp) >
MAX_WBITS + 32) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Invalid parameter give for window size. (%ld)", Z_LVAL(tmp));
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Invalid parameter give for window size. (%pd)", Z_LVAL(tmp));
} else {
windowBits = Z_LVAL(tmp);
}
@@ -369,7 +369,7 @@ static php_stream_filter *php_zlib_filter_create(const char
*filtername, zval *f
/* Memory Level (1 - 9) */
if (Z_LVAL(tmp) < 1 ||
Z_LVAL(tmp) > MAX_MEM_LEVEL) {
- php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Invalid parameter give for memory level. (%ld)",
Z_LVAL(tmp));
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Invalid parameter give for memory level. (%pd)",
Z_LVAL(tmp));
} else {
memLevel = Z_LVAL(tmp);
}
@@ -382,7 +382,7 @@ static php_stream_filter *php_zlib_filter_create(const char
*filtername, zval *f
/* log-2 base of history window
(9 - 15) */
if (Z_LVAL(tmp) < -MAX_WBITS ||
Z_LVAL(tmp) > MAX_WBITS + 16) {
- php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Invalid parameter give for window size. (%ld)",
Z_LVAL(tmp));
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Invalid parameter give for window size. (%pd)",
Z_LVAL(tmp));
} else {
windowBits =
Z_LVAL(tmp);
}
@@ -405,7 +405,7 @@ factory_setlevel:
/* Set compression level within reason
(-1 == default, 0 == none, 1-9 == least to most compression */
if (Z_LVAL(tmp) < -1 || Z_LVAL(tmp) >
9) {
- php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Invalid compression level specified. (%ld)",
Z_LVAL(tmp));
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Invalid compression level specified. (%pd)",
Z_LVAL(tmp));
} else {
level = Z_LVAL(tmp);
}--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
