summaryrefslogtreecommitdiff
path: root/tests/libtest/lib541.c
diff options
context:
space:
mode:
authorJay Satiro <raysatiro@yahoo.com>2017-07-11 01:53:23 -0400
committerJay Satiro <raysatiro@yahoo.com>2017-07-11 01:53:23 -0400
commitc5e87fdb7a60c1c4ef158a876e730b25be7a0894 (patch)
tree9927c02a601eedf82811146eb0ba8ff30d8c89cb /tests/libtest/lib541.c
parente909de65b907ae2be5874201b6881a5196e68c17 (diff)
downloadcurl-c5e87fdb7a60c1c4ef158a876e730b25be7a0894.tar.gz
strerror: Preserve Windows error code in some functions
This is a follow-up to af02162 which removed (SET_)ERRNO macros. That commit was an earlier draft that I committed by mistake, which was then remedied by a5834e5 and e909de6, and now this commit. With this commit there is now no difference between the current code and the changes that were approved in the final draft. Thanks-to: Max Dymond, Marcel Raad, Daniel Stenberg, Gisle Vanem Ref: https://github.com/curl/curl/pull/1589
Diffstat (limited to 'tests/libtest/lib541.c')
-rw-r--r--tests/libtest/lib541.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/libtest/lib541.c b/tests/libtest/lib541.c
index 9aa4a0826..94a26a4b7 100644
--- a/tests/libtest/lib541.c
+++ b/tests/libtest/lib541.c
@@ -38,7 +38,6 @@ int test(char *URL)
FILE *hd_src;
int hd;
struct_stat file_info;
- int error;
if(!libtest_arg2) {
fprintf(stderr, "Usage: <url> <file-to-upload>\n");
@@ -47,9 +46,8 @@ int test(char *URL)
hd_src = fopen(libtest_arg2, "rb");
if(NULL == hd_src) {
- error = errno;
fprintf(stderr, "fopen failed with error: %d %s\n",
- error, strerror(error));
+ errno, strerror(errno));
fprintf(stderr, "Error opening file: %s\n", libtest_arg2);
return -2; /* if this happens things are major weird */
}
@@ -58,9 +56,8 @@ int test(char *URL)
hd = fstat(fileno(hd_src), &file_info);
if(hd == -1) {
/* can't open file, bail out */
- error = errno;
fprintf(stderr, "fstat() failed with error: %d %s\n",
- error, strerror(error));
+ errno, strerror(errno));
fprintf(stderr, "ERROR: cannot open file %s\n", libtest_arg2);
fclose(hd_src);
return TEST_ERR_MAJOR_BAD;