com php-src: Fix printf format issues on i386: ext/standard/dns.c sapi/phpdbg/phpdbg_out.c
| From: | Nikita Popov | Date: | Fri, 17 Nov 2017 21:25:03 +0000 |
| Subject: | com php-src: Fix printf format issues on i386: ext/standard/dns.c sapi/phpdbg/phpdbg_out.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-100294@lists.php.net to get a copy of this message | ||
Commit: 1310234aa341df6aca9cfa27af978bc1e295f24a
Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 17 Nov 2017 22:23:17 +0100
Parents: d5a2ddab53e4f1cbb997f0e541ebb434a741fa9d
Branches: PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1310234aa341df6aca9cfa27af978bc1e295f24a
Log:
Fix printf format issues on i386
Changed paths:
M ext/standard/dns.c
M sapi/phpdbg/phpdbg_out.c
Diff:
diff --git a/ext/standard/dns.c b/ext/standard/dns..c
index ee03a31..9367c05 100644
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -824,13 +824,13 @@ PHP_FUNCTION(dns_get_record)
if (!raw) {
if ((type_param & ~PHP_DNS_ALL) && (type_param != PHP_DNS_ANY)) {
- php_error_docref(NULL, E_WARNING, "Type '%ld' not supported", type_param);
+ php_error_docref(NULL, E_WARNING, "Type '" ZEND_LONG_FMT "' not
supported", type_param);
RETURN_FALSE;
}
} else {
if ((type_param < 1) || (type_param > 0xFFFF)) {
php_error_docref(NULL, E_WARNING,
- "Numeric DNS record type must be between 1 and 65535, '%ld' given",
type_param);
+ "Numeric DNS record type must be between 1 and 65535, '" ZEND_LONG_FMT
"' given", type_param);
RETURN_FALSE;
}
}
diff --git a/sapi/phpdbg/phpdbg_out.c b/sapi/phpdbg/phpdbg_out.c
index 0eead04..1305bf6 100644
--- a/sapi/phpdbg/phpdbg_out.c
+++ b/sapi/phpdbg/phpdbg_out.c
@@ -589,7 +589,7 @@ static int format_converter(register buffy *odp, const char *fmt, zend_bool esca
case 'r':
if (PHPDBG_G(req_id)) {
- s_len = spprintf(&s, 0, "req=\"%lu\"", PHPDBG_G(req_id));
+ s_len = spprintf(&s, 0, "req=\"" ZEND_ULONG_FMT "\"",
PHPDBG_G(req_id));
free_s = s;
} else {
s = "";
@@ -1062,7 +1062,7 @@ static int phpdbg_process_print(int fd, int type, const char *tag, const char
*m
if (PHPDBG_G(req_id)) {
char *xmlbuf = NULL;
- xmllen = phpdbg_asprintf(&xmlbuf, "req=\"%lu\" %.*s", PHPDBG_G(req_id),
xmllen, xml);
+ xmllen = phpdbg_asprintf(&xmlbuf, "req=\"" ZEND_ULONG_FMT "\"
%.*s", PHPDBG_G(req_id), xmllen, xml);
xml = xmlbuf;
}
if (msgout) {