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

server: sync timediff_t type across modules

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

5
tests/server/util.c
View File

@ -54,6 +54,7 @@
#include "getpart.h" #include "getpart.h"
#include "util.h" #include "util.h"
#include "timeval.h" #include "timeval.h"
#include "timediff.h"
#ifdef USE_WINSOCK #ifdef USE_WINSOCK
#undef EINTR #undef EINTR
@ -64,6 +65,8 @@
const char *serverlogfile = "log/server_default.log"; const char *serverlogfile = "log/server_default.log";
static long timediff(struct timeval newer, struct timeval older);
static struct timeval tvnow(void); static struct timeval tvnow(void);
/* This function returns a pointer to STATIC memory. It converts the given /* This function returns a pointer to STATIC memory. It converts the given
@ -457,7 +460,7 @@ static struct timeval tvnow(void)
#endif #endif
long timediff(struct timeval newer, struct timeval older) static long timediff(struct timeval newer, struct timeval older)
{ {
timediff_t diff = newer.tv_sec-older.tv_sec; timediff_t diff = newer.tv_sec-older.tv_sec;
if(diff >= (LONG_MAX/1000)) if(diff >= (LONG_MAX/1000))

1
tests/server/util.h
View File

@ -37,7 +37,6 @@ enum {
char *data_to_hex(char *data, size_t len); char *data_to_hex(char *data, size_t len);
void logmsg(const char *msg, ...) CURL_PRINTF(1, 2); void logmsg(const char *msg, ...) CURL_PRINTF(1, 2);
long timediff(struct timeval newer, struct timeval older);
#define SERVERLOGS_LOCKDIR "lock" /* within logdir */ #define SERVERLOGS_LOCKDIR "lock" /* within logdir */