diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-06-07 14:15:05 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-06-07 14:36:00 +0200 |
| commit | b319734240f3de283a5aeaa5fdd3b6f5892a89e8 (patch) | |
| tree | 027c89f2b7351c5041172f9997dc11e2b89d8fbb | |
| parent | 386e1873234e31e4162cb86f1748a154d9522d49 (diff) | |
| download | curl-b319734240f3de283a5aeaa5fdd3b6f5892a89e8.tar.gz | |
curlx: remove warnless function use from the tool
| -rw-r--r-- | lib/curlx.h | 13 | ||||
| -rw-r--r-- | src/Makefile.inc | 6 | ||||
| -rw-r--r-- | src/tool_getparam.c | 4 |
3 files changed, 4 insertions, 19 deletions
diff --git a/lib/curlx.h b/lib/curlx.h index dffda1ddd..087e2ae86 100644 --- a/lib/curlx.h +++ b/lib/curlx.h @@ -29,11 +29,6 @@ * be. */ -#include <curl/mprintf.h> -/* this is still a public header file that provides the curl_mprintf() - functions while they still are offered publicly. They will be made library- - private one day */ - #include "strtoofft.h" /* "strtoofft.h" provides this function: curlx_strtoofft(), returns a curl_off_t number from a given string. @@ -42,13 +37,5 @@ #include "nonblock.h" /* "nonblock.h" provides curlx_nonblock() */ -#include "warnless.h" -/* "warnless.h" provides functions: - - curlx_ultous() - curlx_ultouc() - curlx_uztosi() -*/ - #endif /* HEADER_CURL_CURLX_H */ diff --git a/src/Makefile.inc b/src/Makefile.inc index 5074f8fc6..96fba6871 100644 --- a/src/Makefile.inc +++ b/src/Makefile.inc @@ -11,14 +11,12 @@ # the official API, but we re-use the code here to avoid duplication. CURLX_CFILES = \ ../lib/strtoofft.c \ - ../lib/nonblock.c \ - ../lib/warnless.c + ../lib/nonblock.c CURLX_HFILES = \ ../lib/curl_setup.h \ ../lib/strtoofft.h \ - ../lib/nonblock.h \ - ../lib/warnless.h + ../lib/nonblock.h CURL_CFILES = \ slist_wc.c \ diff --git a/src/tool_getparam.c b/src/tool_getparam.c index db26e2011..2e5b761ff 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -1330,7 +1330,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ &-letter */ char *oldpost = config->postfields; curl_off_t oldlen = config->postfieldsize; - curl_off_t newlen = oldlen + curlx_uztoso(size) + 2; + curl_off_t newlen = oldlen + (curl_off_t)size + 2; config->postfields = malloc((size_t)newlen); if(!config->postfields) { Curl_safefree(oldpost); @@ -1348,7 +1348,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ } else { config->postfields = postdata; - config->postfieldsize = curlx_uztoso(size); + config->postfieldsize = (curl_off_t)size; } } /* |