diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-04-15 15:40:40 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-04-15 15:40:40 +0400 |
| commit | 050d7e38ad4163e7fa65e26724d3516ce7b33601 (patch) | |
| tree | 2bb49b1b73c37b35fc778e83d9353f0eb9cc12a3 /main/streams/memory.c | |
| parent | 93d3a613d82d32dd6f5499e211bfe194d60898b0 (diff) | |
| download | php-git-050d7e38ad4163e7fa65e26724d3516ce7b33601.tar.gz | |
Cleanup (1-st round)
Diffstat (limited to 'main/streams/memory.c')
| -rw-r--r-- | main/streams/memory.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/streams/memory.c b/main/streams/memory.c index e11a109bcb..89bd59e215 100644 --- a/main/streams/memory.c +++ b/main/streams/memory.c @@ -641,11 +641,11 @@ static php_stream * php_stream_url_wrap_rfc2397(php_stream_wrapper *wrapper, con array_init(&meta); if (!semi) { /* there is only a mime type */ - add_assoc_stringl(&meta, "mediatype", (char *) path, mlen, 1); + add_assoc_stringl(&meta, "mediatype", (char *) path, mlen); mlen = 0; } else if (sep && sep < semi) { /* there is a mime type */ plen = semi - path; - add_assoc_stringl(&meta, "mediatype", (char *) path, plen, 1); + add_assoc_stringl(&meta, "mediatype", (char *) path, plen); mlen -= plen; path += plen; } else if (semi != path || mlen != sizeof(";base64")-1 || memcmp(path, ";base64", sizeof(";base64")-1)) { /* must be error since parameters are only allowed after mediatype */ @@ -675,7 +675,7 @@ static php_stream * php_stream_url_wrap_rfc2397(php_stream_wrapper *wrapper, con plen = sep - path; vlen = (semi ? semi - sep : mlen - plen) - 1 /* '=' */; key = estrndup(path, plen); - add_assoc_stringl_ex(&meta, key, plen, sep + 1, vlen, 1); + add_assoc_stringl_ex(&meta, key, plen, sep + 1, vlen); efree(key); plen += vlen + 1; mlen -= plen; |