[PATCH 1/8] ui-shared: remove "format" from cgit_print_age()

John Keeping john at keeping.me.uk
Tue Jan 19 20:33:01 CET 2016


We never use any format other than FMT_SHORTDATE, so move that into the
function.

Signed-off-by: John Keeping <john at keeping.me.uk>
---
 ui-log.c      | 4 ++--
 ui-refs.c     | 6 +++---
 ui-repolist.c | 2 +-
 ui-shared.c   | 4 ++--
 ui-shared.h   | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ui-log.c b/ui-log.c
index 4573255..bc625db 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -202,7 +202,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
 	}
 	else {
 		html("<td>");
-		cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
+		cgit_print_age(commit->date, TM_WEEK * 2);
 		html("</td>");
 	}
 
@@ -242,7 +242,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
 
 	if (revs->graph) {
 		html("</td><td>");
-		cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
+		cgit_print_age(commit->date, TM_WEEK * 2);
 	}
 
 	if (!lines_counted && (ctx.repo->enable_log_filecount ||
diff --git a/ui-refs.c b/ui-refs.c
index 295a4c7..0652b89 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -73,7 +73,7 @@ static int print_branch(struct refinfo *ref)
 		html_txt(info->author);
 		cgit_close_filter(ctx.repo->email_filter);
 		html("</td><td colspan='2'>");
-		cgit_print_age(info->commit->date, -1, NULL);
+		cgit_print_age(info->commit->date, -1);
 	} else {
 		html("</td><td></td><td>");
 		cgit_object_link(ref->object);
@@ -161,9 +161,9 @@ static int print_tag(struct refinfo *ref)
 	html("</td><td colspan='2'>");
 	if (info) {
 		if (info->tagger_date > 0)
-			cgit_print_age(info->tagger_date, -1, NULL);
+			cgit_print_age(info->tagger_date, -1);
 	} else if (ref->object->type == OBJ_COMMIT) {
-		cgit_print_age(ref->commit->commit->date, -1, NULL);
+		cgit_print_age(ref->commit->commit->date, -1);
 	}
 	html("</td></tr>\n");
 
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)
 {
 	time_t t;
 	if (get_repo_modtime(repo, &t))
-		cgit_print_age(t, -1, NULL);
+		cgit_print_age(t, -1);
 }
 
 static int is_match(struct cgit_repo *repo)
diff --git a/ui-shared.c b/ui-shared.c
index 5b48734..34d3367 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -635,7 +635,7 @@ static void print_rel_date(time_t t, double value,
 	htmlf("'>%.0f %s</span>", value, suffix);
 }
 
-void cgit_print_age(time_t t, time_t max_relative, const char *format)
+void cgit_print_age(time_t t, time_t max_relative)
 {
 	time_t now, secs;
 
@@ -650,7 +650,7 @@ void cgit_print_age(time_t t, time_t max_relative, const char *format)
 		html("<span title='");
 		html_attr(fmt_date(t, FMT_LONGDATE, ctx.cfg.local_time));
 		html("'>");
-		cgit_print_date(t, format, ctx.cfg.local_time);
+		cgit_print_date(t, FMT_SHORTDATE, ctx.cfg.local_time);
 		html("</span>");
 		return;
 	}
diff --git a/ui-shared.h b/ui-shared.h
index 474e0c5..4d655d9 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -62,7 +62,7 @@ extern void cgit_print_error(const char *fmt, ...);
 __attribute__((format (printf,1,0)))
 extern void cgit_vprint_error(const char *fmt, va_list ap);
 extern void cgit_print_date(time_t secs, const char *format, int local_time);
-extern void cgit_print_age(time_t t, time_t max_relative, const char *format);
+extern void cgit_print_age(time_t t, time_t max_relative);
 extern void cgit_print_http_headers(void);
 extern void cgit_redirect(const char *url, bool permanent);
 extern void cgit_print_docstart(void);
-- 
2.7.0.226.gfe986fe



More information about the CGit mailing list