From 2c7f785b945586262ebd5114bb87148bdbf7d2aa Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 26 Feb 2025 16:59:40 +0100 Subject: [PATCH] server: drop two util macros --- tests/server/util.c | 4 ++-- tests/server/util.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/server/util.c b/tests/server/util.c index 1e2d024521..b8a47b1fbb 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -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; diff --git a/tests/server/util.h b/tests/server/util.h index 3e5278d068..69121c587f 100644 --- a/tests/server/util.h +++ b/tests/server/util.h @@ -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 */