diff options
author | John Keeping | 2016-01-19 19:33:01 +0000 |
---|---|---|
committer | Jason A. Donenfeld | 2016-02-08 14:19:33 +0100 |
commit | 57ea1aa2a5eab7f6aba702b3366fe4dcc72124f6 (patch) | |
tree | c84c92e2a148de649cfb31d93384dbd28f1e2cee | |
parent | 23f7dadaaba2817c92c42c0a642a3186aa8ef24d (diff) | |
download | cgit-57ea1aa2a5eab7f6aba702b3366fe4dcc72124f6.tar.gz cgit-57ea1aa2a5eab7f6aba702b3366fe4dcc72124f6.tar.bz2 cgit-57ea1aa2a5eab7f6aba702b3366fe4dcc72124f6.zip |
ui-shared: remove "format" from cgit_print_age()
We never use any format other than FMT_SHORTDATE, so move that into the
function.
Signed-off-by: John Keeping <john@keeping.me.uk>
-rw-r--r-- | ui-log.c | 4 | ||||
-rw-r--r-- | ui-refs.c | 6 | ||||
-rw-r--r-- | ui-repolist.c | 2 | ||||
-rw-r--r-- | ui-shared.c | 4 | ||||
-rw-r--r-- | ui-shared.h | 2 |
5 files changed, 9 insertions, 9 deletions
@@ -204,7 +204,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs) | |||
204 | } | 204 | } |
205 | else { | 205 | else { |
206 | html("<td>"); | 206 | html("<td>"); |
207 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); | 207 | cgit_print_age(commit->date, TM_WEEK * 2); |
208 | html("</td>"); | 208 | html("</td>"); |
209 | } | 209 | } |
210 | 210 | ||
@@ -244,7 +244,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs) | |||
244 | 244 | ||
245 | if (revs->graph) { | 245 | if (revs->graph) { |
246 | html("</td><td>"); | 246 | html("</td><td>"); |
247 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); | 247 | cgit_print_age(commit->date, TM_WEEK * 2); |
248 | } | 248 | } |
249 | 249 | ||
250 | if (!lines_counted && (ctx.repo->enable_log_filecount || | 250 | if (!lines_counted && (ctx.repo->enable_log_filecount || |
@@ -73,7 +73,7 @@ static int print_branch(struct refinfo *ref) | |||
73 | html_txt(info->author); | 73 | html_txt(info->author); |
74 | cgit_close_filter(ctx.repo->email_filter); | 74 | cgit_close_filter(ctx.repo->email_filter); |
75 | html("</td><td colspan='2'>"); | 75 | html("</td><td colspan='2'>"); |
76 | cgit_print_age(info->commit->date, -1, NULL); | 76 | cgit_print_age(info->commit->date, -1); |
77 | } else { | 77 | } else { |
78 | html("</td><td></td><td>"); | 78 | html("</td><td></td><td>"); |
79 | cgit_object_link(ref->object); | 79 | cgit_object_link(ref->object); |
@@ -161,9 +161,9 @@ static int print_tag(struct refinfo *ref) | |||
161 | html("</td><td colspan='2'>"); | 161 | html("</td><td colspan='2'>"); |
162 | if (info) { | 162 | if (info) { |
163 | if (info->tagger_date > 0) | 163 | if (info->tagger_date > 0) |
164 | cgit_print_age(info->tagger_date, -1, NULL); | 164 | cgit_print_age(info->tagger_date, -1); |
165 | } else if (ref->object->type == OBJ_COMMIT) { | 165 | } else if (ref->object->type == OBJ_COMMIT) { |
166 | cgit_print_age(ref->commit->commit->date, -1, NULL); | 166 | cgit_print_age(ref->commit->commit->date, -1); |
167 | } | 167 | } |
168 | html("</td></tr>\n"); | 168 | html("</td></tr>\n"); |
169 | 169 | ||
diff --git a/ui-repolist.c b/ui-repolist.c index 6010a39..6004469 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -79,7 +79,7 @@ static void print_modtime(struct cgit_repo *repo) | |||
79 | { | 79 | { |
80 | time_t t; | 80 | time_t t; |
81 | if (get_repo_modtime(repo, &t)) | 81 | if (get_repo_modtime(repo, &t)) |
82 | cgit_print_age(t, -1, NULL); | 82 | cgit_print_age(t, -1); |
83 | } | 83 | } |
84 | 84 | ||
85 | static int is_match(struct cgit_repo *repo) | 85 | static int is_match(struct cgit_repo *repo) |
diff --git a/ui-shared.c b/ui-shared.c index 54bbde7..76aac60 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -635,7 +635,7 @@ static void print_rel_date(time_t t, double value, | |||
635 | htmlf("'>%.0f %s</span>", value, suffix); | 635 | htmlf("'>%.0f %s</span>", value, suffix); |
636 | } | 636 | } |
637 | 637 | ||
638 | void cgit_print_age(time_t t, time_t max_relative, const char *format) | 638 | void cgit_print_age(time_t t, time_t max_relative) |
639 | { | 639 | { |
640 | time_t now, secs; | 640 | time_t now, secs; |
641 | 641 | ||
@@ -650,7 +650,7 @@ void cgit_print_age(time_t t, time_t max_relative, const char *format) | |||
650 | html("<span title='"); | 650 | html("<span title='"); |
651 | html_attr(fmt_date(t, FMT_LONGDATE, ctx.cfg.local_time)); | 651 | html_attr(fmt_date(t, FMT_LONGDATE, ctx.cfg.local_time)); |
652 | html("'>"); | 652 | html("'>"); |
653 | cgit_print_date(t, format, ctx.cfg.local_time); | 653 | cgit_print_date(t, FMT_SHORTDATE, ctx.cfg.local_time); |
654 | html("</span>"); | 654 | html("</span>"); |
655 | return; | 655 | return; |
656 | } | 656 | } |
diff --git a/ui-shared.h b/ui-shared.h index de08e1b..c9413ed 100644 --- a/ui-shared.h +++ b/ui-shared.h | |||
@@ -62,7 +62,7 @@ extern void cgit_print_error(const char *fmt, ...); | |||
62 | __attribute__((format (printf,1,0))) | 62 | __attribute__((format (printf,1,0))) |
63 | extern void cgit_vprint_error(const char *fmt, va_list ap); | 63 | extern void cgit_vprint_error(const char *fmt, va_list ap); |
64 | extern void cgit_print_date(time_t secs, const char *format, int local_time); | 64 | extern void cgit_print_date(time_t secs, const char *format, int local_time); |
65 | extern void cgit_print_age(time_t t, time_t max_relative, const char *format); | 65 | extern void cgit_print_age(time_t t, time_t max_relative); |
66 | extern void cgit_print_http_headers(void); | 66 | extern void cgit_print_http_headers(void); |
67 | extern void cgit_redirect(const char *url, bool permanent); | 67 | extern void cgit_redirect(const char *url, bool permanent); |
68 | extern void cgit_print_docstart(void); | 68 | extern void cgit_print_docstart(void); |