date: remove approxidate_relative()

When 29f4332e66 (Quit passing 'now' to date code, 2019-09-11) removed
its timeval parameter, approxidate_relative() became equivalent to
approxidate().  Convert its last two call sites and remove the redundant
function.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/date.c b/date.c
index 6f45eeb3568671e5b4bb37c2830315a490a12cfe..923e62cfd20bd3023c88224705bb766722ee8811 100644 (file)
--- a/date.c
+++ b/date.c
@@ -1365,20 +1365,6 @@ static timestamp_t approxidate_str(const char *date,
        return (timestamp_t)update_tm(&tm, &now, 0);
 }
 
-timestamp_t approxidate_relative(const char *date)
-{
-       struct timeval tv;
-       timestamp_t timestamp;
-       int offset;
-       int errors = 0;
-
-       if (!parse_date_basic(date, &timestamp, &offset))
-               return timestamp;
-
-       get_time(&tv);
-       return approxidate_str(date, (const struct timeval *) &tv, &errors);
-}
-
 timestamp_t approxidate_careful(const char *date, int *error_ret)
 {
        struct timeval tv;

diff --git a/date.h b/date.h
index 5d4eaba0a90e39f8684bb5500695ba07b5ea5521..6136212a19004497382e5bae8d6675ebaac62011 100644 (file)
--- a/date.h
+++ b/date.h
@@ -68,7 +68,6 @@ int parse_expiry_date(const char *date, timestamp_t *timestamp);
 void datestamp(struct strbuf *out);
 #define approxidate(s) approxidate_careful((s), NULL)
 timestamp_t approxidate_careful(const char *, int *);
-timestamp_t approxidate_relative(const char *date);
 int date_overflows(timestamp_t date);
 time_t tm_to_time_t(const struct tm *tm);
 #endif

diff --git a/t/helper/test-date.c b/t/helper/test-date.c
index 45951b1df87c7bf90a25cc1497344681ae42a161..80ffe9fec47983eb9d7da9c9e2d6c12140f12139 100644 (file)
--- a/t/helper/test-date.c
+++ b/t/helper/test-date.c
@@ -81,7 +81,7 @@ static void parse_approxidate(const char **argv)
 {
        for (; *argv; argv++) {
                timestamp_t t;
-               t = approxidate_relative(*argv);
+               t = approxidate(*argv);
                printf("%s -> %s\n", *argv, show_date(t, 0, DATE_MODE(ISO8601)));
        }
 }
@@ -90,7 +90,7 @@ static void parse_approx_timestamp(const char **argv)
 {
        for (; *argv; argv++) {
                timestamp_t t;
-               t = approxidate_relative(*argv);
+               t = approxidate(*argv);
                printf("%s -> %"PRItime"\n", *argv, t);
        }
 }