X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5d6ea567cad05f1f504c1cc4b51aa452ad3ba5e6..94187a80bd60baab4b9c4b949ad820d730578123:/sbr/dtime.c diff --git a/sbr/dtime.c b/sbr/dtime.c index 56d874e0..5e0fdc0a 100644 --- a/sbr/dtime.c +++ b/sbr/dtime.c @@ -118,7 +118,7 @@ dlocaltime (time_t *clock) tw.tw_clock = *clock; - return (&tw); + return &tw; } @@ -165,7 +165,7 @@ dgmtime (time_t *clock) tw.tw_clock = *clock; - return (&tw); + return &tw; } @@ -345,14 +345,17 @@ dmktime (struct tws *tw) while (--mon) result += dmsize[mon - 1]; result += mday - 1; - result = 24 * result + hour; - result = 60 * result + min; - result = 60 * result + sec; + result *= 24; /* Days to hours. */ + result += hour; + result *= 60; /* Hours to minutes. */ + result += min; + result *= 60; /* Minutes to seconds. */ + result += sec; result -= 60 * tw->tw_zone; if (tw->tw_flags & TW_DST) - result -= 60 * 60; + result -= 60 * 60; /* One hour. */ - return (tw->tw_clock = result); + return tw->tw_clock = result; } @@ -405,6 +408,6 @@ twsort (struct tws *tw1, struct tws *tw2) if (tw2->tw_clock == 0) dmktime (tw2); - return ((c1 = tw1->tw_clock) > (c2 = tw2->tw_clock) ? 1 - : c1 == c2 ? 0 : -1); + return (c1 = tw1->tw_clock) > (c2 = tw2->tw_clock) ? 1 + : c1 == c2 ? 0 : -1; }