diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-11-17 22:23:17 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-11-17 22:25:03 +0100 |
| commit | 1310234aa341df6aca9cfa27af978bc1e295f24a (patch) | |
| tree | a5a287e9ec0c79f828f568d7267855529273e98c | |
| parent | d5a2ddab53e4f1cbb997f0e541ebb434a741fa9d (diff) | |
| download | php-git-1310234aa341df6aca9cfa27af978bc1e295f24a.tar.gz | |
Fix printf format issues on i386
| -rw-r--r-- | ext/standard/dns.c | 4 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_out.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/dns.c b/ext/standard/dns.c index ee03a31e25..9367c054b8 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 0eead04495..1305bf6d5e 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) { |