luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server: drop two util macros

Browse Source
This commit is contained in:
Viktor Szakats 2025-02-26 16:59:40 +01:00
parent ee713df069
commit 2c7f785b94
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/server/util.c
View File

@ -209,13 +209,13 @@ 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, logdir2, 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;

2
tests/server/util.h
View File

@ -39,8 +39,6 @@ char *data_to_hex(char *data, size_t len);
void logmsg(const char *msg, ...) CURL_PRINTF(1, 2);
long timediff(struct timeval newer, struct timeval older);
#define TEST_DATA_PATH "%s/data/test%ld"
#define ALTTEST_DATA_PATH "%s/test%ld"
#define SERVERLOGS_LOCKDIR "lock" /* within logdir */
/* global variable, where to find the 'data' dir */