From: Viktor Szakats Date: Thu, 6 Mar 2025 03:13:23 +0000 (+0100) Subject: tests: reformat error messages to avoid tripping MSBuild X-Git-Tag: curl-8_13_0~237 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9463769f2e2dba9eeff554a88e5df5195d2c774b;p=thirdparty%2Fcurl.git tests: reformat error messages to avoid tripping MSBuild Change the format of error messages sent to stderr from tests and test servers. As a workaround to avoid triggering Visual Studio's MSBuild tool's built-in regexp matcher, and making it mark builds failed for reasons we don't want them to hard fail. Roughly, the pattern to avoid is the word "error" (case-insensitive) in the same line with a colon `:`. It affected GHA/windows MSVC CI jobs, causing flakiness: ``` CUSTOMBUILD : fopen() failed with error : 13 Permission denied [D:\a\curl\curl\bld\tests\test-ci.vcxproj] Error opening file: log/4/smtp_sockfilt.log [...] CUSTOMBUILD : fopen() failed with error : 13 Permission denied [D:\a\curl\curl\bld\tests\test-ci.vcxproj] Error opening file: log/8/imap_sockfilt.log Msg not logged: 00:18:10.656000 > 178 bytes data, server => client [...] TESTDONE: 1629 tests out of 1634 reported OK: 99% Building Custom Rule D:/a/curl/curl/tests/CMakeLists.txt C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\VC\v170\Microsoft.CppCommon.targets(254,5): error MSB8066: Custom build for 'D:\a\curl\curl\bld\CMakeFiles\621f80ddbb0fa48179f056ca77842ff0\test-ci.rule;D:\a\curl\curl\tests\CMakeLists.txt' exited with code -1. [D:\a\curl\curl\bld\tests\test-ci.vcxproj] Error: Process completed with exit code 1. ``` Ref: https://github.com/curl/curl/actions/runs/13643149623/job/38137076210?pr=16490#step:14:3125 Ref: https://github.com/curl/curl/actions/runs/13688765792/job/38277961720?pr=16582#step:14:1717 The `IgnoreStandardErrorWarningFormat="true"` MSBuild Exec option controls this behavior: https://learn.microsoft.com/visualstudio/msbuild/exec-task#parameters I couldn't figure out a way to apply it to CMake builds. MSBuid pattern matching rules: https://github.com/dotnet/msbuild/blob/353c0f3d37957cc98bfa6a76b568d70d12193fc3/src/Shared/CanonicalError.cs https://learn.microsoft.com/visualstudio/msbuild/msbuild-diagnostic-format-for-tasks Note: There may be further error messages output from runtests scripts, that use this format, which are not explicitly fatal. They may need future fixes. Thanks-to: Dion Williams Ref: https://github.com/curl/curl/discussions/14854#discussioncomment-12382190 Ref: https://github.com/curl/curl/discussions/14854#discussioncomment-12395224 Closes #16583 --- diff --git a/tests/libtest/lib1523.c b/tests/libtest/lib1523.c index 529bbf83dc..d72ef038c6 100644 --- a/tests/libtest/lib1523.c +++ b/tests/libtest/lib1523.c @@ -70,11 +70,11 @@ CURLcode test(char *URL) ret = run(hnd, 1, 2); if(ret) - fprintf(stderr, "error %d: %s\n", ret, buffer); + fprintf(stderr, "error (%d) %s\n", ret, buffer); ret = run(hnd, 12000, 1); if(ret != CURLE_OPERATION_TIMEDOUT) - fprintf(stderr, "error %d: %s\n", ret, buffer); + fprintf(stderr, "error (%d) %s\n", ret, buffer); else ret = CURLE_OK; diff --git a/tests/libtest/lib505.c b/tests/libtest/lib505.c index 7bc60ce764..8755c95780 100644 --- a/tests/libtest/lib505.c +++ b/tests/libtest/lib505.c @@ -56,9 +56,9 @@ CURLcode test(char *URL) hd_src = fopen(libtest_arg2, "rb"); if(!hd_src) { - fprintf(stderr, "fopen failed with error: %d %s\n", + fprintf(stderr, "fopen failed with error (%d) %s\n", errno, strerror(errno)); - fprintf(stderr, "Error opening file: %s\n", libtest_arg2); + fprintf(stderr, "Error opening file '%s'\n", libtest_arg2); return TEST_ERR_MAJOR_BAD; /* if this happens things are major weird */ } @@ -70,15 +70,15 @@ CURLcode test(char *URL) #endif if(hd == -1) { /* can't open file, bail out */ - fprintf(stderr, "fstat() failed with error: %d %s\n", + fprintf(stderr, "fstat() failed with error (%d) %s\n", errno, strerror(errno)); - fprintf(stderr, "ERROR: cannot open file %s\n", libtest_arg2); + fprintf(stderr, "Error opening file '%s'\n", libtest_arg2); fclose(hd_src); return TEST_ERR_MAJOR_BAD; } if(!file_info.st_size) { - fprintf(stderr, "ERROR: file %s has zero size!\n", libtest_arg2); + fprintf(stderr, "File %s has zero size!\n", libtest_arg2); fclose(hd_src); return TEST_ERR_MAJOR_BAD; } diff --git a/tests/libtest/lib525.c b/tests/libtest/lib525.c index 17eb147c7a..d98444687b 100644 --- a/tests/libtest/lib525.c +++ b/tests/libtest/lib525.c @@ -56,9 +56,9 @@ CURLcode test(char *URL) hd_src = fopen(libtest_arg2, "rb"); if(!hd_src) { - fprintf(stderr, "fopen failed with error: %d (%s)\n", + fprintf(stderr, "fopen failed with error (%d) %s\n", errno, strerror(errno)); - fprintf(stderr, "Error opening file: (%s)\n", libtest_arg2); + fprintf(stderr, "Error opening file '%s'\n", libtest_arg2); return TEST_ERR_FOPEN; } @@ -70,9 +70,9 @@ CURLcode test(char *URL) #endif if(hd == -1) { /* can't open file, bail out */ - fprintf(stderr, "fstat() failed with error: %d (%s)\n", + fprintf(stderr, "fstat() failed with error (%d) %s\n", errno, strerror(errno)); - fprintf(stderr, "ERROR: cannot open file (%s)\n", libtest_arg2); + fprintf(stderr, "Error opening file '%s'\n", libtest_arg2); fclose(hd_src); return TEST_ERR_FSTAT; } diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c index c63b0a5b87..ac503be7fc 100644 --- a/tests/libtest/lib530.c +++ b/tests/libtest/lib530.c @@ -238,7 +238,7 @@ static int socket_action(CURLM *curl, curl_socket_t s, int evBitmask, int numhandles = 0; CURLMcode result = curl_multi_socket_action(curl, s, evBitmask, &numhandles); if(result != CURLM_OK) { - fprintf(stderr, "Curl error on %s: %i (%s)\n", + fprintf(stderr, "Curl error on %s (%i) %s\n", info, result, curl_multi_strerror(result)); } return (int)result; diff --git a/tests/libtest/lib541.c b/tests/libtest/lib541.c index 2d2b8e55e5..1a7a4cce39 100644 --- a/tests/libtest/lib541.c +++ b/tests/libtest/lib541.c @@ -48,9 +48,9 @@ CURLcode test(char *URL) hd_src = fopen(libtest_arg2, "rb"); if(!hd_src) { - fprintf(stderr, "fopen failed with error: %d %s\n", + fprintf(stderr, "fopen failed with error (%d) %s\n", errno, strerror(errno)); - fprintf(stderr, "Error opening file: %s\n", libtest_arg2); + fprintf(stderr, "Error opening file '%s'\n", libtest_arg2); return (CURLcode)-2; /* if this happens things are major weird */ } @@ -62,15 +62,15 @@ CURLcode test(char *URL) #endif if(hd == -1) { /* can't open file, bail out */ - fprintf(stderr, "fstat() failed with error: %d %s\n", + fprintf(stderr, "fstat() failed with error (%d) %s\n", errno, strerror(errno)); - fprintf(stderr, "ERROR: cannot open file %s\n", libtest_arg2); + fprintf(stderr, "Error opening file '%s'\n", libtest_arg2); fclose(hd_src); return TEST_ERR_MAJOR_BAD; } if(!file_info.st_size) { - fprintf(stderr, "ERROR: file %s has zero size!\n", libtest_arg2); + fprintf(stderr, "File %s has zero size!\n", libtest_arg2); fclose(hd_src); return TEST_ERR_MAJOR_BAD; } diff --git a/tests/libtest/lib582.c b/tests/libtest/lib582.c index e5e3583dc4..44705c6e21 100644 --- a/tests/libtest/lib582.c +++ b/tests/libtest/lib582.c @@ -206,7 +206,7 @@ static void notifyCurl(CURLM *curl, curl_socket_t s, int evBitmask, int numhandles = 0; CURLMcode result = curl_multi_socket_action(curl, s, evBitmask, &numhandles); if(result != CURLM_OK) { - fprintf(stderr, "Curl error on %s: %i (%s)\n", + fprintf(stderr, "Curl error on %s (%i) %s\n", info, result, curl_multi_strerror(result)); } } @@ -249,9 +249,9 @@ CURLcode test(char *URL) hd_src = fopen(libtest_arg2, "rb"); if(!hd_src) { - fprintf(stderr, "fopen() failed with error: %d (%s)\n", + fprintf(stderr, "fopen() failed with error (%d) %s\n", errno, strerror(errno)); - fprintf(stderr, "Error opening file: (%s)\n", libtest_arg2); + fprintf(stderr, "Error opening file '%s'\n", libtest_arg2); return TEST_ERR_FOPEN; } @@ -263,9 +263,9 @@ CURLcode test(char *URL) #endif if(hd == -1) { /* can't open file, bail out */ - fprintf(stderr, "fstat() failed with error: %d (%s)\n", + fprintf(stderr, "fstat() failed with error (%d) %s\n", errno, strerror(errno)); - fprintf(stderr, "ERROR: cannot open file (%s)\n", libtest_arg2); + fprintf(stderr, "Error opening file '%s'\n", libtest_arg2); fclose(hd_src); return TEST_ERR_FSTAT; } diff --git a/tests/libtest/lib591.c b/tests/libtest/lib591.c index 742baf2022..ae2885d832 100644 --- a/tests/libtest/lib591.c +++ b/tests/libtest/lib591.c @@ -49,9 +49,9 @@ CURLcode test(char *URL) upload = fopen(libtest_arg3, "rb"); if(!upload) { - fprintf(stderr, "fopen() failed with error: %d (%s)\n", + fprintf(stderr, "fopen() failed with error (%d) %s\n", errno, strerror(errno)); - fprintf(stderr, "Error opening file: (%s)\n", libtest_arg3); + fprintf(stderr, "Error opening file '%s'\n", libtest_arg3); return TEST_ERR_FOPEN; } diff --git a/tests/server/mqttd.c b/tests/server/mqttd.c index d170ee31a0..68c31e2bba 100644 --- a/tests/server/mqttd.c +++ b/tests/server/mqttd.c @@ -748,7 +748,7 @@ static bool incoming(curl_socket_t listenfd) } while((rc == -1) && ((error = SOCKERRNO) == EINTR)); if(rc < 0) { - logmsg("select() failed with error: (%d) %s", + logmsg("select() failed with error (%d) %s", error, strerror(error)); return FALSE; } @@ -758,7 +758,7 @@ static bool incoming(curl_socket_t listenfd) if(CURL_SOCKET_BAD == newfd) { error = SOCKERRNO; logmsg("accept(%" FMT_SOCKET_T ", NULL, NULL) " - "failed with error: (%d) %s", sockfd, error, sstrerror(error)); + "failed with error (%d) %s", sockfd, error, sstrerror(error)); } else { logmsg("====> Client connect, fd %" FMT_SOCKET_T ". " @@ -796,13 +796,13 @@ static curl_socket_t sockdaemon(curl_socket_t sock, (void *)&flag, sizeof(flag)); if(rc) { error = SOCKERRNO; - logmsg("setsockopt(SO_REUSEADDR) failed with error: (%d) %s", + logmsg("setsockopt(SO_REUSEADDR) failed with error (%d) %s", error, sstrerror(error)); if(maxretr) { rc = wait_ms(delay); if(rc) { /* should not happen */ - logmsg("wait_ms() failed with error: %d", rc); + logmsg("wait_ms() failed with error (%d)", rc); sclose(sock); return CURL_SOCKET_BAD; } @@ -818,7 +818,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock, } while(rc && maxretr--); if(rc) { - logmsg("setsockopt(SO_REUSEADDR) failed %d times in %d ms. Error: (%d) %s", + logmsg("setsockopt(SO_REUSEADDR) failed %d times in %d ms. Error (%d) %s", attempt, totdelay, error, strerror(error)); logmsg("Continuing anyway..."); } @@ -846,7 +846,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock, #endif /* USE_IPV6 */ if(rc) { error = SOCKERRNO; - logmsg("Error binding socket on port %hu: (%d) %s", + logmsg("Error binding socket on port %hu (%d) %s", *listenport, error, sstrerror(error)); sclose(sock); return CURL_SOCKET_BAD; @@ -868,7 +868,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock, memset(&localaddr.sa, 0, (size_t)la_size); if(getsockname(sock, &localaddr.sa, &la_size) < 0) { error = SOCKERRNO; - logmsg("getsockname() failed with error: (%d) %s", + logmsg("getsockname() failed with error (%d) %s", error, sstrerror(error)); sclose(sock); return CURL_SOCKET_BAD; @@ -900,7 +900,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock, rc = listen(sock, 5); if(0 != rc) { error = SOCKERRNO; - logmsg("listen(%" FMT_SOCKET_T ", 5) failed with error: (%d) %s", + logmsg("listen(%" FMT_SOCKET_T ", 5) failed with error (%d) %s", sock, error, sstrerror(error)); sclose(sock); return CURL_SOCKET_BAD; @@ -1030,7 +1030,7 @@ int main(int argc, char *argv[]) if(CURL_SOCKET_BAD == sock) { error = SOCKERRNO; - logmsg("Error creating socket: (%d) %s", error, sstrerror(error)); + logmsg("Error creating socket (%d) %s", error, sstrerror(error)); goto mqttd_cleanup; } diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c index 5e7fbfca36..33fcd5689e 100644 --- a/tests/server/rtspd.c +++ b/tests/server/rtspd.c @@ -268,7 +268,7 @@ static int ProcessRequest(struct httprequest *req) if(!stream) { int error = errno; - logmsg("fopen() failed with error: %d %s", error, strerror(error)); + logmsg("fopen() failed with error (%d) %s", error, strerror(error)); logmsg("Couldn't open test file %ld", req->testno); req->open = FALSE; /* closes connection */ return 1; /* done */ @@ -288,7 +288,7 @@ static int ProcessRequest(struct httprequest *req) int error = getpart(&cmd, &cmdsize, "reply", "servercmd", stream); fclose(stream); if(error) { - logmsg("getpart() failed with error: %d", error); + logmsg("getpart() failed with error (%d)", error); req->open = FALSE; /* closes connection */ return 1; /* done */ } @@ -593,7 +593,7 @@ static void storerequest(char *reqbuf, size_t totalsize) dump = fopen(dumpfile, "ab"); } while(!dump && ((error = errno) == EINTR)); if(!dump) { - logmsg("Error opening file %s error: %d %s", + logmsg("Error opening file %s error (%d) %s", dumpfile, error, strerror(error)); logmsg("Failed to write request input to %s", dumpfile); return; @@ -612,7 +612,7 @@ static void storerequest(char *reqbuf, size_t totalsize) if(writeleft == 0) logmsg("Wrote request (%zu bytes) input to %s", totalsize, dumpfile); else if(writeleft > 0) { - logmsg("Error writing file %s error: %d %s", + logmsg("Error writing file %s error (%d) %s", dumpfile, error, strerror(error)); logmsg("Wrote only (%zu bytes) of (%zu bytes) request input to %s", totalsize-writeleft, totalsize, dumpfile); @@ -622,7 +622,7 @@ storerequest_cleanup: res = fclose(dump); if(res) - logmsg("Error closing file %s error: %d %s", + logmsg("Error closing file %s error (%d) %s", dumpfile, errno, strerror(errno)); } @@ -689,7 +689,7 @@ static int get_request(curl_socket_t sock, struct httprequest *req) } else if(got < 0) { error = SOCKERRNO; - logmsg("recv() returned error: (%d) %s", error, sstrerror(error)); + logmsg("recv() returned error (%d) %s", error, sstrerror(error)); fail = 1; } if(fail) { @@ -836,7 +836,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req) msnprintf(partbuf, sizeof(partbuf), "data%ld", req->partno); if(!stream) { error = errno; - logmsg("fopen() failed with error: %d %s", error, strerror(error)); + logmsg("fopen() failed with error (%d) %s", error, strerror(error)); logmsg("Couldn't open test file"); return 0; } @@ -844,7 +844,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req) error = getpart(&ptr, &count, "reply", partbuf, stream); fclose(stream); if(error) { - logmsg("getpart() failed with error: %d", error); + logmsg("getpart() failed with error (%d)", error); return 0; } buffer = ptr; @@ -859,7 +859,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req) stream = test2fopen(req->testno, logdir); if(!stream) { error = errno; - logmsg("fopen() failed with error: %d %s", error, strerror(error)); + logmsg("fopen() failed with error (%d) %s", error, strerror(error)); logmsg("Couldn't open test file"); free(ptr); return 0; @@ -869,7 +869,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req) error = getpart(&cmd, &cmdsize, "reply", "postcmd", stream); fclose(stream); if(error) { - logmsg("getpart() failed with error: %d", error); + logmsg("getpart() failed with error (%d)", error); free(ptr); return 0; } @@ -899,9 +899,9 @@ static int send_doc(curl_socket_t sock, struct httprequest *req) dump = fopen(responsedump, "ab"); if(!dump) { error = errno; - logmsg("fopen() failed with error: %d %s", error, strerror(error)); - logmsg("Error opening file: %s", responsedump); - logmsg("couldn't create logfile: %s", responsedump); + logmsg("fopen() failed with error (%d) %s", error, strerror(error)); + logmsg("Error opening file '%s'", responsedump); + logmsg("couldn't create logfile '%s'", responsedump); free(ptr); free(cmd); return -1; @@ -955,7 +955,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req) res = fclose(dump); if(res) - logmsg("Error closing file %s error: %d %s", + logmsg("Error closing file %s error (%d) %s", responsedump, errno, strerror(errno)); if(got_exit_signal) { @@ -995,7 +995,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req) if(res) { /* should not happen */ error = errno; - logmsg("wait_ms() failed with error: (%d) %s", + logmsg("wait_ms() failed with error (%d) %s", error, strerror(error)); break; } @@ -1142,7 +1142,7 @@ int main(int argc, char *argv[]) if(CURL_SOCKET_BAD == sock) { error = SOCKERRNO; - logmsg("Error creating socket: (%d) %s", error, sstrerror(error)); + logmsg("Error creating socket (%d) %s", error, sstrerror(error)); goto server_cleanup; } @@ -1150,7 +1150,7 @@ int main(int argc, char *argv[]) if(0 != setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&flag, sizeof(flag))) { error = SOCKERRNO; - logmsg("setsockopt(SO_REUSEADDR) failed with error: (%d) %s", + logmsg("setsockopt(SO_REUSEADDR) failed with error (%d) %s", error, sstrerror(error)); goto server_cleanup; } @@ -1175,7 +1175,7 @@ int main(int argc, char *argv[]) #endif /* USE_IPV6 */ if(0 != rc) { error = SOCKERRNO; - logmsg("Error binding socket on port %hu: (%d) %s", + logmsg("Error binding socket on port %hu (%d) %s", port, error, sstrerror(error)); goto server_cleanup; } @@ -1196,7 +1196,7 @@ int main(int argc, char *argv[]) memset(&localaddr.sa, 0, (size_t)la_size); if(getsockname(sock, &localaddr.sa, &la_size) < 0) { error = SOCKERRNO; - logmsg("getsockname() failed with error: (%d) %s", + logmsg("getsockname() failed with error (%d) %s", error, sstrerror(error)); sclose(sock); goto server_cleanup; @@ -1229,7 +1229,7 @@ int main(int argc, char *argv[]) rc = listen(sock, 5); if(0 != rc) { error = SOCKERRNO; - logmsg("listen() failed with error: (%d) %s", + logmsg("listen() failed with error (%d) %s", error, sstrerror(error)); goto server_cleanup; } @@ -1256,7 +1256,7 @@ int main(int argc, char *argv[]) break; if(CURL_SOCKET_BAD == msgsock) { error = SOCKERRNO; - logmsg("MAJOR ERROR: accept() failed with error: (%d) %s", + logmsg("MAJOR ERROR, accept() failed with error (%d) %s", error, sstrerror(error)); break; } diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index 9c346206d1..75d592a2de 100644 --- a/tests/server/sockfilt.c +++ b/tests/server/sockfilt.c @@ -242,7 +242,7 @@ static ssize_t fullread(int filedes, void *buffer, size_t nbytes) return 0; } logmsg("reading from file descriptor: %d,", filedes); - logmsg("unrecoverable read() failure: (%d) %s", + logmsg("unrecoverable read() failure (%d) %s", error, strerror(error)); return -1; } @@ -288,7 +288,7 @@ static ssize_t fullwrite(int filedes, const void *buffer, size_t nbytes) if((error == EINTR) || (error == EAGAIN)) continue; logmsg("writing to file descriptor: %d,", filedes); - logmsg("unrecoverable write() failure: (%d) %s", + logmsg("unrecoverable write() failure (%d) %s", error, strerror(error)); return -1; } @@ -408,7 +408,7 @@ static bool read_data_block(unsigned char *buffer, ssize_t maxlen, *buffer_len = (ssize_t)strtol((char *)buffer, NULL, 16); if(*buffer_len > maxlen) { - logmsg("ERROR: Buffer size (%zd bytes) too small for data size " + logmsg("Buffer size (%zd bytes) too small for data size error " "(%zd bytes)", maxlen, *buffer_len); return FALSE; } @@ -558,7 +558,7 @@ static unsigned int WINAPI select_ws_wait_thread(void *lpParameter) /* if the pipe has NOT been closed, sleep and continue waiting */ ret = GetLastError(); if(ret != ERROR_BROKEN_PIPE) { - logmsg("[select_ws_wait_thread] PeekNamedPipe error: %lu", ret); + logmsg("[select_ws_wait_thread] PeekNamedPipe error (%lu)", ret); SleepEx(0, FALSE); continue; } @@ -925,7 +925,7 @@ static bool disc_handshake(void) return FALSE; } else { - logmsg("Error: unexpected message; aborting"); + logmsg("Unexpected message error; aborting"); /* * The only other messages that could occur here are PING and PORT, * and both of them occur at the start of a test when nothing should be @@ -1084,7 +1084,7 @@ static bool juggle(curl_socket_t *sockfdp, } while((rc == -1) && ((error = SOCKERRNO) == EINTR)); if(rc < 0) { - logmsg("select() failed with error: (%d) %s", + logmsg("select() failed with error (%d) %s", error, sstrerror(error)); return FALSE; } @@ -1187,7 +1187,7 @@ static bool juggle(curl_socket_t *sockfdp, if(CURL_SOCKET_BAD == newfd) { error = SOCKERRNO; logmsg("accept(%" FMT_SOCKET_T ", NULL, NULL) " - "failed with error: (%d) %s", sockfd, error, sstrerror(error)); + "failed with error (%d) %s", sockfd, error, sstrerror(error)); } else { logmsg("====> Client connect"); @@ -1251,14 +1251,14 @@ static curl_socket_t sockdaemon(curl_socket_t sock, (void *)&flag, sizeof(flag)); if(rc) { error = SOCKERRNO; - logmsg("setsockopt(SO_REUSEADDR) failed with error: (%d) %s", + logmsg("setsockopt(SO_REUSEADDR) failed with error (%d) %s", error, sstrerror(error)); if(maxretr) { rc = wait_ms(delay); if(rc) { /* should not happen */ error = errno; - logmsg("wait_ms() failed with error: (%d) %s", + logmsg("wait_ms() failed with error (%d) %s", error, strerror(error)); sclose(sock); return CURL_SOCKET_BAD; @@ -1275,7 +1275,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock, } while(rc && maxretr--); if(rc) { - logmsg("setsockopt(SO_REUSEADDR) failed %d times in %d ms. Error: (%d) %s", + logmsg("setsockopt(SO_REUSEADDR) failed %d times in %d ms. Error (%d) %s", attempt, totdelay, error, strerror(error)); logmsg("Continuing anyway..."); } @@ -1303,7 +1303,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock, #endif /* USE_IPV6 */ if(rc) { error = SOCKERRNO; - logmsg("Error binding socket on port %hu: (%d) %s", + logmsg("Error binding socket on port %hu (%d) %s", *listenport, error, sstrerror(error)); sclose(sock); return CURL_SOCKET_BAD; @@ -1325,7 +1325,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock, memset(&localaddr.sa, 0, (size_t)la_size); if(getsockname(sock, &localaddr.sa, &la_size) < 0) { error = SOCKERRNO; - logmsg("getsockname() failed with error: (%d) %s", + logmsg("getsockname() failed with error (%d) %s", error, sstrerror(error)); sclose(sock); return CURL_SOCKET_BAD; @@ -1363,7 +1363,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock, rc = listen(sock, 5); if(0 != rc) { error = SOCKERRNO; - logmsg("listen(%" FMT_SOCKET_T ", 5) failed with error: (%d) %s", + logmsg("listen(%" FMT_SOCKET_T ", 5) failed with error (%d) %s", sock, error, sstrerror(error)); sclose(sock); return CURL_SOCKET_BAD; @@ -1513,7 +1513,7 @@ int main(int argc, char *argv[]) if(CURL_SOCKET_BAD == sock) { error = SOCKERRNO; - logmsg("Error creating socket: (%d) %s", error, sstrerror(error)); + logmsg("Error creating socket (%d) %s", error, sstrerror(error)); write_stdout("FAIL\n", 5); goto sockfilt_cleanup; } @@ -1548,7 +1548,7 @@ int main(int argc, char *argv[]) #endif /* USE_IPV6 */ if(rc) { error = SOCKERRNO; - logmsg("Error connecting to port %hu: (%d) %s", + logmsg("Error connecting to port %hu (%d) %s", connectport, error, sstrerror(error)); write_stdout("FAIL\n", 5); goto sockfilt_cleanup; diff --git a/tests/server/socksd.c b/tests/server/socksd.c index 58156e45b9..173a94cdd2 100644 --- a/tests/server/socksd.c +++ b/tests/server/socksd.c @@ -278,7 +278,7 @@ static curl_socket_t socksconnect(unsigned short connectport, if(rc) { int error = SOCKERRNO; - logmsg("Error connecting to %s:%hu: (%d) %s", + logmsg("Failed connecting to %s:%hu (%d) %s", connectaddr, connectport, error, sstrerror(error)); return CURL_SOCKET_BAD; } @@ -743,7 +743,7 @@ static bool incoming(curl_socket_t listenfd) } while((rc == -1) && ((error = SOCKERRNO) == EINTR)); if(rc < 0) { - logmsg("select() failed with error: (%d) %s", + logmsg("select() failed with error (%d) %s", error, sstrerror(error)); return FALSE; } @@ -753,7 +753,7 @@ static bool incoming(curl_socket_t listenfd) if(CURL_SOCKET_BAD == newfd) { error = SOCKERRNO; logmsg("accept(%" FMT_SOCKET_T ", NULL, NULL) " - "failed with error: (%d) %s", + "failed with error (%d) %s", sockfd, error, sstrerror(error)); } else { @@ -823,14 +823,14 @@ static curl_socket_t sockdaemon(curl_socket_t sock, (void *)&flag, sizeof(flag)); if(rc) { error = SOCKERRNO; - logmsg("setsockopt(SO_REUSEADDR) failed with error: (%d) %s", + logmsg("setsockopt(SO_REUSEADDR) failed with error (%d) %s", error, sstrerror(error)); if(maxretr) { rc = wait_ms(delay); if(rc) { /* should not happen */ error = errno; - logmsg("wait_ms() failed with error: (%d) %s", + logmsg("wait_ms() failed with error (%d) %s", error, strerror(error)); sclose(sock); return CURL_SOCKET_BAD; @@ -847,7 +847,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock, } while(rc && maxretr--); if(rc) { - logmsg("setsockopt(SO_REUSEADDR) failed %d times in %d ms. Error: (%d) %s", + logmsg("setsockopt(SO_REUSEADDR) failed %d times in %d ms. Error (%d) %s", attempt, totdelay, error, strerror(error)); logmsg("Continuing anyway..."); } @@ -882,11 +882,11 @@ static curl_socket_t sockdaemon(curl_socket_t sock, error = SOCKERRNO; #ifdef USE_UNIX_SOCKETS if(socket_domain == AF_UNIX) - logmsg("Error binding socket on path %s: (%d) %s", + logmsg("Error binding socket on path %s (%d) %s", unix_socket, error, sstrerror(error)); else #endif - logmsg("Error binding socket on port %hu: (%d) %s", + logmsg("Error binding socket on port %hu (%d) %s", *listenport, error, sstrerror(error)); sclose(sock); return CURL_SOCKET_BAD; @@ -910,7 +910,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock, memset(&localaddr.sa, 0, (size_t)la_size); if(getsockname(sock, &localaddr.sa, &la_size) < 0) { error = SOCKERRNO; - logmsg("getsockname() failed with error: (%d) %s", + logmsg("getsockname() failed with error (%d) %s", error, sstrerror(error)); sclose(sock); return CURL_SOCKET_BAD; @@ -942,7 +942,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock, rc = listen(sock, 5); if(0 != rc) { error = SOCKERRNO; - logmsg("listen(%" FMT_SOCKET_T ", 5) failed with error: (%d) %s", + logmsg("listen(%" FMT_SOCKET_T ", 5) failed with error (%d) %s", sock, error, sstrerror(error)); sclose(sock); return CURL_SOCKET_BAD; @@ -1092,7 +1092,7 @@ int main(int argc, char *argv[]) if(CURL_SOCKET_BAD == sock) { error = SOCKERRNO; - logmsg("Error creating socket: (%d) %s", + logmsg("Error creating socket (%d) %s", error, sstrerror(error)); goto socks5_cleanup; } diff --git a/tests/server/sws.c b/tests/server/sws.c index 3d1e60cfaa..3d88cb2cf9 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -241,7 +241,7 @@ static int parse_servercmd(struct httprequest *req) if(!stream) { error = errno; - logmsg("fopen() failed with error: %d %s", error, strerror(error)); + logmsg("fopen() failed with error (%d) %s", error, strerror(error)); logmsg(" Couldn't open test file %ld", req->testno); req->open = FALSE; /* closes connection */ return 1; /* done */ @@ -256,7 +256,7 @@ static int parse_servercmd(struct httprequest *req) error = getpart(&orgcmd, &cmdsize, "reply", "servercmd", stream); fclose(stream); if(error) { - logmsg("getpart() failed with error: %d", error); + logmsg("getpart() failed with error (%d)", error); req->open = FALSE; /* closes connection */ return 1; /* done */ } @@ -778,7 +778,7 @@ static void storerequest(const char *reqbuf, size_t totalsize) dump = fopen(dumpfile, "ab"); } while(!dump && ((error = errno) == EINTR)); if(!dump) { - logmsg("[2] Error opening file %s error: %d %s", + logmsg("[2] Error opening file %s error (%d) %s", dumpfile, error, strerror(error)); logmsg("Failed to write request input "); return; @@ -797,7 +797,7 @@ static void storerequest(const char *reqbuf, size_t totalsize) if(writeleft == 0) logmsg("Wrote request (%zu bytes) input to %s", totalsize, dumpfile); else if(writeleft > 0) { - logmsg("Error writing file %s error: %d %s", + logmsg("Error writing file %s error (%d) %s", dumpfile, error, strerror(error)); logmsg("Wrote only (%zu bytes) of (%zu bytes) request input to %s", totalsize-writeleft, totalsize, dumpfile); @@ -807,7 +807,7 @@ storerequest_cleanup: res = fclose(dump); if(res) - logmsg("Error closing file %s error: %d %s", + logmsg("Error closing file %s error (%d) %s", dumpfile, errno, strerror(errno)); } @@ -939,7 +939,7 @@ static int get_request(curl_socket_t sock, struct httprequest *req) /* nothing to read at the moment */ return 0; } - logmsg("recv() returned error: (%d) %s", error, sstrerror(error)); + logmsg("recv() returned error (%d) %s", error, sstrerror(error)); fail = 1; } if(fail) { @@ -1078,14 +1078,14 @@ static int send_doc(curl_socket_t sock, struct httprequest *req) stream = test2fopen(req->testno, logdir); if(!stream) { error = errno; - logmsg("fopen() failed with error: %d %s", error, strerror(error)); + logmsg("fopen() failed with error (%d) %s", error, strerror(error)); return 0; } else { error = getpart(&ptr, &count, "reply", partbuf, stream); fclose(stream); if(error) { - logmsg("getpart() failed with error: %d", error); + logmsg("getpart() failed with error (%d)", error); return 0; } buffer = ptr; @@ -1100,7 +1100,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req) stream = test2fopen(req->testno, logdir); if(!stream) { error = errno; - logmsg("fopen() failed with error: %d %s", error, strerror(error)); + logmsg("fopen() failed with error (%d) %s", error, strerror(error)); free(ptr); return 0; } @@ -1109,7 +1109,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req) error = getpart(&cmd, &cmdsize, "reply", "postcmd", stream); fclose(stream); if(error) { - logmsg("getpart() failed with error: %d", error); + logmsg("getpart() failed with error (%d)", error); free(ptr); return 0; } @@ -1139,8 +1139,8 @@ static int send_doc(curl_socket_t sock, struct httprequest *req) dump = fopen(responsedump, "ab"); if(!dump) { error = errno; - logmsg("fopen() failed with error: %d %s", error, strerror(error)); - logmsg(" [5] Error opening file: %s", responsedump); + logmsg("fopen() failed with error (%d) %s", error, strerror(error)); + logmsg(" [5] Error opening file '%s'", responsedump); free(ptr); free(cmd); return -1; @@ -1191,7 +1191,7 @@ retry: res = fclose(dump); if(res) - logmsg("Error closing file %s error: %d %s", + logmsg("Error closing file %s error (%d) %s", responsedump, errno, strerror(errno)); if(got_exit_signal) { @@ -1231,7 +1231,7 @@ retry: if(res) { /* should not happen */ error = errno; - logmsg("wait_ms() failed with error: (%d) %s", + logmsg("wait_ms() failed with error (%d) %s", error, strerror(error)); break; } @@ -1284,7 +1284,7 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port) serverfd = socket(socket_domain, SOCK_STREAM, 0); if(CURL_SOCKET_BAD == serverfd) { error = SOCKERRNO; - logmsg("Error creating socket for server connection: (%d) %s", + logmsg("Error creating socket for server connection (%d) %s", error, sstrerror(error)); return CURL_SOCKET_BAD; } @@ -1304,7 +1304,7 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port) * timeouts if the peer is not listening. */ if(0 != curlx_nonblock(serverfd, TRUE)) { error = SOCKERRNO; - logmsg("curlx_nonblock(TRUE) failed with error: (%d) %s", + logmsg("curlx_nonblock(TRUE) failed with error (%d) %s", error, sstrerror(error)); sclose(serverfd); return CURL_SOCKET_BAD; @@ -1387,7 +1387,7 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port) } } error: - logmsg("Error connecting to server port %hu: (%d) %s", + logmsg("Error connecting to server port %hu (%d) %s", port, error, sstrerror(error)); sclose(serverfd); return CURL_SOCKET_BAD; @@ -1398,7 +1398,7 @@ success: if(0 != curlx_nonblock(serverfd, FALSE)) { error = SOCKERRNO; - logmsg("curlx_nonblock(FALSE) failed with error: (%d) %s", + logmsg("curlx_nonblock(FALSE) failed with error (%d) %s", error, sstrerror(error)); sclose(serverfd); return CURL_SOCKET_BAD; @@ -1884,14 +1884,14 @@ static curl_socket_t accept_connection(curl_socket_t sock) /* nothing to accept */ return 0; } - logmsg("MAJOR ERROR: accept() failed with error: (%d) %s", + logmsg("MAJOR ERROR, accept() failed with error (%d) %s", error, sstrerror(error)); return CURL_SOCKET_BAD; } if(0 != curlx_nonblock(msgsock, TRUE)) { error = SOCKERRNO; - logmsg("curlx_nonblock failed with error: (%d) %s", + logmsg("curlx_nonblock failed with error (%d) %s", error, sstrerror(error)); sclose(msgsock); return CURL_SOCKET_BAD; @@ -1900,7 +1900,7 @@ static curl_socket_t accept_connection(curl_socket_t sock) if(0 != setsockopt(msgsock, SOL_SOCKET, SO_KEEPALIVE, (void *)&flag, sizeof(flag))) { error = SOCKERRNO; - logmsg("setsockopt(SO_KEEPALIVE) failed with error: (%d) %s", + logmsg("setsockopt(SO_KEEPALIVE) failed with error (%d) %s", error, sstrerror(error)); sclose(msgsock); return CURL_SOCKET_BAD; @@ -2206,7 +2206,7 @@ int main(int argc, char *argv[]) if(CURL_SOCKET_BAD == sock) { error = SOCKERRNO; - logmsg("Error creating socket: (%d) %s", error, sstrerror(error)); + logmsg("Error creating socket (%d) %s", error, sstrerror(error)); goto sws_cleanup; } @@ -2214,13 +2214,13 @@ int main(int argc, char *argv[]) if(0 != setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&flag, sizeof(flag))) { error = SOCKERRNO; - logmsg("setsockopt(SO_REUSEADDR) failed with error: (%d) %s", + logmsg("setsockopt(SO_REUSEADDR) failed with error (%d) %s", error, sstrerror(error)); goto sws_cleanup; } if(0 != curlx_nonblock(sock, TRUE)) { error = SOCKERRNO; - logmsg("curlx_nonblock failed with error: (%d) %s", + logmsg("curlx_nonblock failed with error (%d) %s", error, sstrerror(error)); goto sws_cleanup; } @@ -2251,11 +2251,11 @@ int main(int argc, char *argv[]) error = SOCKERRNO; #ifdef USE_UNIX_SOCKETS if(socket_domain == AF_UNIX) - logmsg("Error binding socket on path %s: (%d) %s", + logmsg("Error binding socket on path %s (%d) %s", unix_socket, error, sstrerror(error)); else #endif - logmsg("Error binding socket on port %hu: (%d) %s", + logmsg("Error binding socket on port %hu (%d) %s", port, error, sstrerror(error)); goto sws_cleanup; } @@ -2276,7 +2276,7 @@ int main(int argc, char *argv[]) memset(&localaddr.sa, 0, (size_t)la_size); if(getsockname(sock, &localaddr.sa, &la_size) < 0) { error = SOCKERRNO; - logmsg("getsockname() failed with error: (%d) %s", + logmsg("getsockname() failed with error (%d) %s", error, sstrerror(error)); sclose(sock); goto sws_cleanup; @@ -2315,7 +2315,7 @@ int main(int argc, char *argv[]) rc = listen(sock, 50); if(0 != rc) { error = SOCKERRNO; - logmsg("listen() failed with error: (%d) %s", error, sstrerror(error)); + logmsg("listen() failed with error (%d) %s", error, sstrerror(error)); goto sws_cleanup; } @@ -2395,7 +2395,7 @@ int main(int argc, char *argv[]) if(rc < 0) { error = SOCKERRNO; - logmsg("select() failed with error: (%d) %s", error, sstrerror(error)); + logmsg("select() failed with error (%d) %s", error, sstrerror(error)); goto sws_cleanup; } diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index 1adaec610d..a3166dfe0d 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -658,7 +658,7 @@ int main(int argc, char **argv) if(CURL_SOCKET_BAD == sock) { error = SOCKERRNO; - logmsg("Error creating socket: (%d) %s", error, sstrerror(error)); + logmsg("Error creating socket (%d) %s", error, sstrerror(error)); result = 1; goto tftpd_cleanup; } @@ -667,7 +667,7 @@ int main(int argc, char **argv) if(0 != setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&flag, sizeof(flag))) { error = SOCKERRNO; - logmsg("setsockopt(SO_REUSEADDR) failed with error: (%d) %s", + logmsg("setsockopt(SO_REUSEADDR) failed with error (%d) %s", error, sstrerror(error)); result = 1; goto tftpd_cleanup; @@ -693,7 +693,7 @@ int main(int argc, char **argv) #endif /* USE_IPV6 */ if(0 != rc) { error = SOCKERRNO; - logmsg("Error binding socket on port %hu: (%d) %s", port, error, + logmsg("Error binding socket on port %hu (%d) %s", port, error, sstrerror(error)); result = 1; goto tftpd_cleanup; @@ -715,7 +715,7 @@ int main(int argc, char **argv) memset(&localaddr.sa, 0, (size_t)la_size); if(getsockname(sock, &localaddr.sa, &la_size) < 0) { error = SOCKERRNO; - logmsg("getsockname() failed with error: (%d) %s", + logmsg("getsockname() failed with error (%d) %s", error, sstrerror(error)); sclose(sock); goto tftpd_cleanup; @@ -904,8 +904,8 @@ static int do_tftp(struct testcase *test, struct tftphdr *tp, ssize_t size) server = fopen(dumpfile, "ab"); if(!server) { int error = errno; - logmsg("fopen() failed with error: %d %s", error, strerror(error)); - logmsg("Error opening file: %s", dumpfile); + logmsg("fopen() failed with error (%d) %s", error, strerror(error)); + logmsg("Error opening file '%s'", dumpfile); return -1; } @@ -1011,7 +1011,7 @@ static int parse_servercmd(struct testcase *req) stream = test2fopen(req->testno, logdir); if(!stream) { error = errno; - logmsg("fopen() failed with error: %d %s", error, strerror(error)); + logmsg("fopen() failed with error (%d) %s", error, strerror(error)); logmsg(" Couldn't open test file %ld", req->testno); return 1; /* done */ } @@ -1025,7 +1025,7 @@ static int parse_servercmd(struct testcase *req) error = getpart(&orgcmd, &cmdsize, "reply", "servercmd", stream); fclose(stream); if(error) { - logmsg("getpart() failed with error: %d", error); + logmsg("getpart() failed with error (%d)", error); return 1; /* done */ } @@ -1126,7 +1126,7 @@ static int validate_access(struct testcase *test, if(!stream) { int error = errno; - logmsg("fopen() failed with error: %d %s", error, strerror(error)); + logmsg("fopen() failed with error (%d) %s", error, strerror(error)); logmsg("Couldn't open test file for test: %ld", testno); return EACCESS; } @@ -1135,7 +1135,7 @@ static int validate_access(struct testcase *test, int error = getpart(&test->buffer, &count, "reply", partbuf, stream); fclose(stream); if(error) { - logmsg("getpart() failed with error: %d", error); + logmsg("getpart() failed with error (%d)", error); return EACCESS; } if(test->buffer) { diff --git a/tests/server/util.c b/tests/server/util.c index df76b7810b..9508ddf128 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -100,7 +100,7 @@ void logmsg(const char *msg, ...) static int known_offset; if(!serverlogfile) { - fprintf(stderr, "Error: serverlogfile not set\n"); + fprintf(stderr, "Serverlogfile not set error\n"); return; } @@ -130,9 +130,9 @@ void logmsg(const char *msg, ...) } else { int error = errno; - fprintf(stderr, "fopen() failed with error: %d %s\n", + fprintf(stderr, "fopen() failed with error (%d) %s\n", error, strerror(error)); - fprintf(stderr, "Error opening file: %s\n", serverlogfile); + fprintf(stderr, "Error opening file '%s'\n", serverlogfile); fprintf(stderr, "Msg not logged: %s %s\n", timebuf, buffer); } } @@ -345,14 +345,14 @@ void set_advisor_read_lock(const char *filename) lockfile = fopen(filename, "wb"); } while(!lockfile && ((error = errno) == EINTR)); if(!lockfile) { - logmsg("Error creating lock file %s error: %d %s", + logmsg("Error creating lock file %s error (%d) %s", filename, error, strerror(error)); return; } res = fclose(lockfile); if(res) - logmsg("Error closing lock file %s error: %d %s", + logmsg("Error closing lock file %s error (%d) %s", filename, errno, strerror(errno)); } @@ -371,7 +371,7 @@ void clear_advisor_read_lock(const char *filename) res = unlink(filename); } while(res && ((error = errno) == EINTR)); if(res) - logmsg("Error removing lock file %s error: %d %s", + logmsg("Error removing lock file %s error (%d) %s", filename, error, strerror(error)); } @@ -525,7 +525,7 @@ HANDLE exit_event = NULL; static void exit_signal_handler(int signum) { int old_errno = errno; - logmsg("exit_signal_handler: %d", signum); + logmsg("exit_signal_handler (%d)", signum); if(got_exit_signal == 0) { got_exit_signal = 1; exit_signal = signum; @@ -844,7 +844,7 @@ int bind_unix_socket(curl_socket_t sock, const char *unix_socket, /* socket already exists. Perhaps it is stale? */ curl_socket_t unixfd = socket(AF_UNIX, SOCK_STREAM, 0); if(CURL_SOCKET_BAD == unixfd) { - logmsg("Failed to create socket at %s: (%d) %s", + logmsg("Failed to create socket at %s (%d) %s", unix_socket, SOCKERRNO, sstrerror(SOCKERRNO)); return -1; } @@ -853,7 +853,7 @@ int bind_unix_socket(curl_socket_t sock, const char *unix_socket, error = SOCKERRNO; sclose(unixfd); if(0 != rc && ECONNREFUSED != error) { - logmsg("Failed to connect to %s: (%d) %s", + logmsg("Failed to connect to %s (%d) %s", unix_socket, error, sstrerror(error)); return rc; } @@ -865,7 +865,7 @@ int bind_unix_socket(curl_socket_t sock, const char *unix_socket, rc = lstat(unix_socket, &statbuf); #endif if(0 != rc) { - logmsg("Error binding socket, failed to stat %s: (%d) %s", + logmsg("Error binding socket, failed to stat %s (%d) %s", unix_socket, errno, strerror(errno)); return rc; } @@ -878,7 +878,7 @@ int bind_unix_socket(curl_socket_t sock, const char *unix_socket, /* dead socket, cleanup and retry bind */ rc = unlink(unix_socket); if(0 != rc) { - logmsg("Error binding socket, failed to unlink %s: (%d) %s", + logmsg("Error binding socket, failed to unlink %s (%d) %s", unix_socket, errno, strerror(errno)); return rc; }