From: J William Piggott Date: Wed, 7 Jun 2017 17:25:43 +0000 (-0400) Subject: parse-date: refactor tm_diff() X-Git-Tag: v2.31-rc1~285^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d6702edfd7fd16d326fae7d8207d17d93d336ee;p=thirdparty%2Futil-linux.git parse-date: refactor tm_diff() Reported-by: Ruediger Meier Influenced-by: gnulib 30784c4 Paul Eggert Signed-off-by: J William Piggott --- diff --git a/lib/parse-date.y b/lib/parse-date.y index 620626e29c..f96fc09283 100644 --- a/lib/parse-date.y +++ b/lib/parse-date.y @@ -957,7 +957,7 @@ static table const * lookup_zone(parser_control const *pc, char const *name) * The body of this function is taken directly from the GNU C Library; * see src/strftime.c. */ -static long int tm_diff(struct tm const *a, struct tm const *b) +static int tm_diff(struct tm const *a, struct tm const *b) { /** * Compute intervening leap days correctly even if year is negative. @@ -970,8 +970,7 @@ static long int tm_diff(struct tm const *a, struct tm const *b) int a400 = SHR (a100, 2); int b400 = SHR (b100, 2); int intervening_leap_days = (a4 - b4) - (a100 - b100) + (a400 - b400); - int ayear = a->tm_year; - int years = ayear - b->tm_year; + int years = a->tm_year - b->tm_year; int days = (365 * years + intervening_leap_days + (a->tm_yday - b->tm_yday)); return (60 * (60 * (24 * days + (a->tm_hour - b->tm_hour))