diff options
| author | taesubkim <taesub.kim@samsung.com> | 2016-04-25 10:21:23 +0900 |
|---|---|---|
| committer | taesubkim <taesub.kim@samsung.com> | 2016-04-25 10:27:58 +0900 |
| commit | 0a710b32648c435f792f5993fdefa2d96f802580 (patch) | |
| tree | 8370266f83e70616acf75c514a5707407887e4b7 /lib/http_chunks.c | |
| parent | 7b6dca47a42828c0ae87eab0d8b68f97d1495b67 (diff) | |
| download | curl-0a710b32648c435f792f5993fdefa2d96f802580.tar.gz curl-0a710b32648c435f792f5993fdefa2d96f802580.tar.bz2 curl-0a710b32648c435f792f5993fdefa2d96f802580.zip | |
Imported Upstream version 7.48.0upstream/7.48.0
Change-Id: Ibca5368d95ef0b73c945bb0df8b7ef9fc3e3bd82
Signed-off-by: Taesub Kim <taesub.kim@samsung.com>
Diffstat (limited to 'lib/http_chunks.c')
| -rw-r--r-- | lib/http_chunks.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/http_chunks.c b/lib/http_chunks.c index 61a6098a7..53091738a 100644 --- a/lib/http_chunks.c +++ b/lib/http_chunks.c @@ -5,11 +5,11 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. + * are also available at https://curl.haxx.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is @@ -29,15 +29,12 @@ #include "content_encoding.h" #include "http.h" -#include "curl_memory.h" #include "non-ascii.h" /* for Curl_convert_to_network prototype */ #include "strtoofft.h" #include "warnless.h" -#define _MPRINTF_REPLACE /* use our functions only */ -#include <curl/mprintf.h> - -/* The last #include file should be: */ +/* The last #include files should be: */ +#include "curl_memory.h" #include "memdebug.h" /* @@ -158,7 +155,7 @@ CHUNKcode Curl_httpchunk_read(struct connectdata *conn, if(result) { /* Curl_convert_from_network calls failf if unsuccessful */ /* Treat it as a bad hex character */ - return CHUNKE_ILLEGAL_HEX ; + return CHUNKE_ILLEGAL_HEX; } ch->datasize=curlx_strtoofft(ch->hexbuffer, &endptr, 16); @@ -221,7 +218,6 @@ CHUNKcode Curl_httpchunk_read(struct connectdata *conn, (ssize_t)piece); break; - case COMPRESS: default: failf (conn->data, "Unrecognized content encoding type. " |