romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 00:13:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

tests/server: round of tidy-ups

Browse source 
Dedupe, merge macros, globals, make symbols local where possible.
Drop unused macros and headers. Drop `DEFAULT_LOGFILE` macro in favour
of `--logfile` command-line option.

Ref: #15000
Closes #16525
This commit is contained in:
Viktor Szakats 2024-09-08 16:18:57 +02:00
parent 387311012c
commit 9213e4e497
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
9 changed files with 66 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

50
tests/server/util.c
View file

@ -54,13 +54,9 @@
#include "getpart.h"
#include "util.h"
#include "timeval.h"
#include "timediff.h"
#ifdef USE_WINSOCK
#undef EINTR
#define EINTR 4 /* errno.h value */
#undef EINVAL
#define EINVAL 22 /* errno.h value */
#endif
const char *serverlogfile = NULL; /* needs init from main() */
static struct timeval tvnow(void);
@ -143,7 +139,7 @@ void logmsg(const char *msg, ...)
#ifdef _WIN32
/* use instead of perror() on generic Windows */
void win32_perror(const char *msg)
static void win32_perror(const char *msg)
{
char buf[512];
int err = SOCKERRNO;
@ -174,7 +170,7 @@ int win32_init(void)
err = WSAStartup(wVersionRequested, &wsaData);
if(err) {
perror("Winsock init failed");
win32_perror("Winsock init failed");
logmsg("Error initialising Winsock -- aborting");
return 1;
}
@ -182,7 +178,7 @@ int win32_init(void)
if(LOBYTE(wsaData.wVersion) != LOBYTE(wVersionRequested) ||
HIBYTE(wsaData.wVersion) != HIBYTE(wVersionRequested) ) {
WSACleanup();
perror("Winsock init failed");
win32_perror("Winsock init failed");
logmsg("No suitable winsock.dll found -- aborting");
return 1;
}
@ -202,23 +198,36 @@ const char *sstrerror(int err)
/* set by the main code to point to where the test dir is */
const char *path = ".";
FILE *test2fopen(long testno, const char *logdir)
FILE *test2fopen(long testno, const char *logdir2)
{
FILE *stream;
char filename[256];
/* first try the alternative, preprocessed, file */
msnprintf(filename, sizeof(filename), ALTTEST_DATA_PATH, logdir, testno);
msnprintf(filename, sizeof(filename), "%s/test%ld", logdir2, testno);
stream = fopen(filename, "rb");
if(stream)
return stream;
/* then try the source version */
msnprintf(filename, sizeof(filename), TEST_DATA_PATH, path, testno);
msnprintf(filename, sizeof(filename), "%s/data/test%ld", path, testno);
stream = fopen(filename, "rb");
return stream;
}
#if !defined(MSDOS) && !defined(USE_WINSOCK)
static long timediff(struct timeval newer, struct timeval older)
{
timediff_t diff = newer.tv_sec-older.tv_sec;
if(diff >= (LONG_MAX/1000))
return LONG_MAX;
else if(diff <= (LONG_MIN/1000))
return LONG_MIN;
return (long)(newer.tv_sec-older.tv_sec)*1000+
(long)(newer.tv_usec-older.tv_usec)/1000;
}
#endif
/*
* Portable function used for waiting a specific amount of ms.
* Waiting indefinitely with this function is not allowed, a
@ -455,17 +464,6 @@ static struct timeval tvnow(void)
#endif
long timediff(struct timeval newer, struct timeval older)
{
timediff_t diff = newer.tv_sec-older.tv_sec;
if(diff >= (LONG_MAX/1000))
return LONG_MAX;
else if(diff <= (LONG_MIN/1000))
return LONG_MIN;
return (long)(newer.tv_sec-older.tv_sec)*1000+
(long)(newer.tv_usec-older.tv_usec)/1000;
}
/* vars used to keep around previous signal handlers */
typedef void (*SIGHANDLER_T)(int);
@ -633,7 +631,7 @@ static unsigned int WINAPI main_window_loop(void *lpParameter)
wc.hInstance = (HINSTANCE)lpParameter;
wc.lpszClassName = TEXT("MainWClass");
if(!RegisterClass(&wc)) {
perror("RegisterClass failed");
win32_perror("RegisterClass failed");
return (DWORD)-1;
}
@ -645,14 +643,14 @@ static unsigned int WINAPI main_window_loop(void *lpParameter)
(HWND)NULL, (HMENU)NULL,
wc.hInstance, (LPVOID)NULL);
if(!hidden_main_window) {
perror("CreateWindowEx failed");
win32_perror("CreateWindowEx failed");
return (DWORD)-1;
}
do {
ret = GetMessage(&msg, NULL, 0, 0);
if(ret == -1) {
perror("GetMessage failed");
win32_perror("GetMessage failed");
return (DWORD)-1;
}
else if(ret) {