diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2021-03-08 12:30:56 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-03-11 10:11:56 +0100 |
| commit | 78f642ffab9a703bb23e4d9ddb1abe582f14eb62 (patch) | |
| tree | 8b2d24c24f34dc1968dedcb612f81349960d4ce7 /src | |
| parent | 6043dfa4f9471cf4f5da2492670aff26b16a94ab (diff) | |
| download | curl-78f642ffab9a703bb23e4d9ddb1abe582f14eb62.tar.gz | |
config: remove CURL_SIZEOF_CURL_OFF_T use only SIZEOF_CURL_OFF_T
Make the code consistently use a single name for the size of the
"curl_off_t" type.
Closes #6702
Diffstat (limited to 'src')
| -rw-r--r-- | src/tool_cb_prg.c | 4 | ||||
| -rw-r--r-- | src/tool_cb_see.c | 4 | ||||
| -rw-r--r-- | src/tool_progress.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/tool_cb_prg.c b/src/tool_cb_prg.c index 50f33aa51..bb93d15f8 100644 --- a/src/tool_cb_prg.c +++ b/src/tool_cb_prg.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2021, 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 @@ -117,7 +117,7 @@ static void fly(struct ProgressData *bar, bool moved) #if (SIZEOF_CURL_OFF_T == 4) # define CURL_OFF_T_MAX CURL_OFF_T_C(0x7FFFFFFF) #else - /* assume CURL_SIZEOF_CURL_OFF_T == 8 */ + /* assume SIZEOF_CURL_OFF_T == 8 */ # define CURL_OFF_T_MAX CURL_OFF_T_C(0x7FFFFFFFFFFFFFFF) #endif diff --git a/src/tool_cb_see.c b/src/tool_cb_see.c index 2163aeaf6..e96aa6444 100644 --- a/src/tool_cb_see.c +++ b/src/tool_cb_see.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2021, 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 @@ -48,7 +48,7 @@ int tool_seek_cb(void *userdata, curl_off_t offset, int whence) { struct InStruct *in = userdata; -#if(CURL_SIZEOF_CURL_OFF_T > SIZEOF_OFF_T) && !defined(USE_WIN32_LARGE_FILES) +#if(SIZEOF_CURL_OFF_T > SIZEOF_OFF_T) && !defined(USE_WIN32_LARGE_FILES) /* The offset check following here is only interesting if curl_off_t is larger than off_t and we are not using the WIN32 large file support diff --git a/src/tool_progress.c b/src/tool_progress.c index b18f63596..7db6df909 100644 --- a/src/tool_progress.c +++ b/src/tool_progress.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2021, 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 @@ -51,7 +51,7 @@ static char *max5data(curl_off_t bytes, char *max5) CURL_FORMAT_CURL_OFF_T "M", bytes/ONE_MEGABYTE, (bytes%ONE_MEGABYTE) / (ONE_MEGABYTE/CURL_OFF_T_C(10)) ); -#if (CURL_SIZEOF_CURL_OFF_T > 4) +#if (SIZEOF_CURL_OFF_T > 4) else if(bytes < CURL_OFF_T_C(10000) * ONE_MEGABYTE) /* 'XXXXM' is good until we're at 10000MB or above */ |