diff options
| author | Jay Satiro <raysatiro@yahoo.com> | 2017-06-19 00:52:38 -0400 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2017-07-10 02:09:27 -0400 |
| commit | af0216251b94e751baa47146ac9609db70793b8e (patch) | |
| tree | de39c7130d519f0bcda17b9a09df822f02fc32e6 /src | |
| parent | 17da6750026cf00277aad3a44fd20b1a4cea6406 (diff) | |
curl_setup_once: Remove ERRNO/SET_ERRNO macros
Prior to this change (SET_)ERRNO mapped to GetLastError/SetLastError
for Win32 and regular errno otherwise.
I reviewed the code and found no justifiable reason for conflating errno
on WIN32 with GetLastError/SetLastError. All Win32 CRTs support errno,
and any Win32 multithreaded CRT supports thread-local errno.
Fixes https://github.com/curl/curl/issues/895
Closes https://github.com/curl/curl/pull/1589
Diffstat (limited to 'src')
| -rw-r--r-- | src/tool_dirhie.c | 2 | ||||
| -rw-r--r-- | src/tool_paramhlp.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/tool_dirhie.c b/src/tool_dirhie.c index 23bb2cb42..1d7359205 100644 --- a/src/tool_dirhie.c +++ b/src/tool_dirhie.c @@ -50,7 +50,7 @@ static void show_dir_errno(FILE *errors, const char *name) { - switch(ERRNO) { + switch(errno) { #ifdef EACCES case EACCES: fprintf(errors, "You don't have permission to create %s.\n", name); diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c index 6b534ce5d..ee37931b8 100644 --- a/src/tool_paramhlp.c +++ b/src/tool_paramhlp.c @@ -383,11 +383,11 @@ ParameterError str2offset(curl_off_t *val, const char *str) #if(CURL_SIZEOF_CURL_OFF_T > CURL_SIZEOF_LONG) *val = curlx_strtoofft(str, &endptr, 0); - if((*val == CURL_OFF_T_MAX || *val == CURL_OFF_T_MIN) && (ERRNO == ERANGE)) + if((*val == CURL_OFF_T_MAX || *val == CURL_OFF_T_MIN) && (errno == ERANGE)) return PARAM_BAD_NUMERIC; #else *val = strtol(str, &endptr, 0); - if((*val == LONG_MIN || *val == LONG_MAX) && ERRNO == ERANGE) + if((*val == LONG_MIN || *val == LONG_MAX) && errno == ERANGE) return PARAM_BAD_NUMERIC; #endif if((endptr != str) && (endptr == str + strlen(str))) |