]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
parse-date: refactor tm_diff()
authorJ William Piggott <elseifthen@gmx.com>
Wed, 7 Jun 2017 17:25:43 +0000 (13:25 -0400)
committerJ William Piggott <elseifthen@gmx.com>
Thu, 15 Jun 2017 19:02:58 +0000 (15:02 -0400)
Reported-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Influenced-by: gnulib 30784c4 Paul Eggert <eggert@cs.ucla.edu>
Signed-off-by: J William Piggott <elseifthen@gmx.com>
lib/parse-date.y

index 620626e29cd981df6559422e9ac4c356c462f200..f96fc092831284452a561e0f2a38f3fd579958cc 100644 (file)
@@ -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))