RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 20:22:45 +00:00
Code Issues Activity Actions

LibC+ping: Let's use the traditional timersub() et al prototypes

Browse source 
This also fixes the build, since ping.cpp already had a timersub().
This commit is contained in:
Andreas Kling 2019-12-27 23:07:28 +01:00
parent 71922ee6a5
commit 2cbc3c6ee5
2 changed files with 16 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Libraries/LibC/sys/time.h
View file

@ -9,23 +9,23 @@ __BEGIN_DECLS
#define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
#define timercmp(tvp, uvp, cmp) \
(((tvp)->tv_sec == (uvp)->tv_sec) ? ((tvp)->tv_usec cmp(uvp)->tv_usec) : ((tvp)->tv_sec cmp(uvp)->tv_sec))
#define timeradd(tvp, uvp) \
do { \
(tvp)->tv_sec += (uvp)->tv_sec; \
(tvp)->tv_usec += (uvp)->tv_usec; \
if ((tvp)->tv_usec >= 1000000) { \
(tvp)->tv_sec++; \
(tvp)->tv_usec -= 1000000; \
} \
#define timeradd(a, b, out) \
do { \
(out)->tv_sec = (a)->tv_sec + (b)->tv_sec; \
(out)->tv_usec = (a)->tv_usec + (b)->tv_usec; \
if ((out)->tv_usec >= 1000000) { \
(out)->tv_sec++; \
(out)->tv_usec -= 1000000; \
} \
} while (0)
#define timersub(tvp, uvp) \
do { \
(tvp)->tv_sec -= (uvp)->tv_sec; \
(tvp)->tv_usec -= (uvp)->tv_usec; \
if ((tvp)->tv_usec < 0) { \
(tvp)->tv_sec--; \
(tvp)->tv_usec += 1000000; \
} \
#define timersub(a, b, out) \
do { \
(out)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
(out)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
if ((out)->tv_usec < 0) { \
(out)->tv_sec--; \
(out)->tv_usec += 1000000; \
} \
} while (0)
struct timeval {

10
Userland/ping.cpp
View file

@ -24,16 +24,6 @@ uint16_t internet_checksum(const void* ptr, size_t count)
return htons(~checksum);
}
inline void timersub(struct timeval* a, struct timeval* b, struct timeval* result)
{
result->tv_sec = a->tv_sec - b->tv_sec;
result->tv_usec = a->tv_usec - b->tv_usec;
if (result->tv_usec < 0) {
--result->tv_sec;
result->tv_usec += 1000000;
}
}
int main(int argc, char** argv)
{
if (argc != 2) {