diff options
author | René Scharfe <l.s.r@web.de> | 2023-04-08 12:35:24 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-04-10 18:46:40 +0300 |
commit | 8a7f0b666fc749166421669fba62b1000321bd26 (patch) | |
tree | f3e5a25ccaa39712eb8d99af80522cef55cb3b94 | |
parent | 73876f4861cd3d187a4682290ab75c9dccadbc56 (diff) |
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>
-rw-r--r-- | date.c | 14 | ||||
-rw-r--r-- | date.h | 1 | ||||
-rw-r--r-- | t/helper/test-date.c | 4 |
3 files changed, 2 insertions, 17 deletions
@@ -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, ×tamp, &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; @@ -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 45951b1df8..80ffe9fec4 100644 --- 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); } } |