diff options
| author | Nikita Popov <nikic@php.net> | 2016-02-14 14:02:19 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-02-14 14:45:53 +0100 |
| commit | c9357f82d3882eb3c7cb9f63dbc98d354fb20739 (patch) | |
| tree | e4733ea1e1f5d866ef8ba6b63eb93b013d95c348 /ext/iconv | |
| parent | 59833783641622160903d56c0aa522db01b59f4c (diff) | |
| download | php-git-c9357f82d3882eb3c7cb9f63dbc98d354fb20739.tar.gz | |
Format string fixes
Conflicts:
ext/pgsql/pgsql.c
Diffstat (limited to 'ext/iconv')
| -rw-r--r-- | ext/iconv/iconv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 309258b4c7..4dd6784209 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -424,9 +424,9 @@ static int php_iconv_output_handler(void **nothing, php_output_context *output_c char *p = strstr(get_output_encoding(), "//"); if (p) { - len = spprintf(&content_type, 0, "Content-Type:%.*s; charset=%.*s", mimetype_len ? mimetype_len : (size_t) strlen(mimetype), mimetype, (size_t)(p - get_output_encoding()), get_output_encoding()); + len = spprintf(&content_type, 0, "Content-Type:%.*s; charset=%.*s", mimetype_len ? mimetype_len : (int) strlen(mimetype), mimetype, (int) (p - get_output_encoding()), get_output_encoding()); } else { - len = spprintf(&content_type, 0, "Content-Type:%.*s; charset=%s", mimetype_len ? mimetype_len : (size_t) strlen(mimetype), mimetype, get_output_encoding()); + len = spprintf(&content_type, 0, "Content-Type:%.*s; charset=%s", mimetype_len ? mimetype_len : (int) strlen(mimetype), mimetype, get_output_encoding()); } if (content_type && SUCCESS == sapi_add_header(content_type, (uint)len, 0)) { SG(sapi_headers).send_default_content_type = 0; |