diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-04-21 00:33:35 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-04-21 00:33:35 +0300 |
commit | fa9172c70af55a013e7fe2c5c3c97ba63002a7e5 (patch) | |
tree | c29cce6d9477cc5c7f1c83c2990aff4f115c385d | |
parent | cbfe844aa1b6b0b9513f2ae2fc3d18ff3dd385e6 (diff) | |
parent | 8a7f0b666fc749166421669fba62b1000321bd26 (diff) |
Merge branch 'rs/remove-approxidate-relative'
The approxidate() API has been simplified by losing an extra
function that did the same thing as another one.
* rs/remove-approxidate-relative:
date: remove approxidate_relative()
-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
@@ -1366,20 +1366,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 cd6a6df702..2d9232cc68 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); } } |