ui-repolist: extract get_repo_modtime() from print_modtime()

The new function is then used by both print_modtime() and
cgit_reposort_modtime().

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 18 insertions, 26 deletions

diff --git a/ui-repolist.c b/ui-repolist.c
index 312a7ee..436a774 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -7,63 +7,72 @@
  */
 
 #include <time.h>
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 
 time_t read_agefile(char *path)
 {
         FILE *f;
         static char buf[64], buf2[64];
 
         if (!(f = fopen(path, "r")))
                 return -1;
         if (fgets(buf, sizeof(buf), f) == NULL)
                 return -1;
         fclose(f);
         if (parse_date(buf, buf2, sizeof(buf2)))
                 return strtoul(buf2, NULL, 10);
         else
                 return 0;
 }
 
-static void print_modtime(struct cgit_repo *repo)
+static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
 {
         char *path;
         struct stat s;
 
         path = fmt("%s/%s", repo->path, ctx.cfg.agefile);
         if (stat(path, &s) == 0) {
-                cgit_print_age(read_agefile(path), -1, NULL);
-                return;
+                *mtime = read_agefile(path);
+                return 1;
         }
 
         path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
-        if (stat(path, &s) != 0)
-                return;
-        cgit_print_age(s.st_mtime, -1, NULL);
+        if (stat(path, &s) == 0) {
+                *mtime = s.st_mtime;
+                return 1;
+        }
+        return 0;
+}
+
+static void print_modtime(struct cgit_repo *repo)
+{
+        time_t t;
+        if (get_repo_modtime(repo, &t))
+                cgit_print_age(t, -1, NULL);
 }
 
 int is_match(struct cgit_repo *repo)
 {
         if (!ctx.qry.search)
                 return 1;
         if (repo->url && strcasestr(repo->url, ctx.qry.search))
                 return 1;
         if (repo->name && strcasestr(repo->name, ctx.qry.search))
                 return 1;
         if (repo->desc && strcasestr(repo->desc, ctx.qry.search))
                 return 1;
         if (repo->owner && strcasestr(repo->owner, ctx.qry.search))
                 return 1;
         return 0;
 }
 
 int is_in_url(struct cgit_repo *repo)
 {
         if (!ctx.qry.url)
                 return 1;
         if (repo->url && !prefixcmp(repo->url, ctx.qry.url))
                 return 1;
         return 0;
@@ -75,70 +84,53 @@ void print_header(int columns)
              "<th class='left'>Name</th>"
              "<th class='left'>Description</th>"
              "<th class='left'>Owner</th>"
              "<th class='left'><a href=\"?s=1\">Idle</a></th>");
         if (ctx.cfg.enable_index_links)
                 html("<th class='left'>Links</th>");
         html("</tr>\n");
 }
 
 
 void print_pager(int items, int pagelen, char *search)
 {
         int i;
         html("<div class='pager'>");
         for(i = 0; i * pagelen < items; i++)
                 cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL,
                                 search, i * pagelen);
         html("</div>");
 }
 
 static int cgit_reposort_modtime(const void *a, const void *b)
 {
         const struct cgit_repo *r1 = a;
         const struct cgit_repo *r2 = b;
-        char *path;
-        struct stat s;
         time_t t1, t2;
-        path = fmt("%s/%s", r1->path, ctx.cfg.agefile);
-        if (stat(path, &s) == 0) {
-                t1 = read_agefile(path);
-        } else {
-                path = fmt("%s/refs/heads/%s", r1->path, r1->defbranch);
-                if (stat(path, &s) != 0)
-                        return 0;
-                t1 =s.st_mtime;
-        }
 
-        path = fmt("%s/%s", r2->path, ctx.cfg.agefile);
-        if (stat(path, &s) == 0) {
-                t2 = read_agefile(path);
-        } else {
-                path = fmt("%s/refs/heads/%s", r2->path, r2->defbranch);
-                if (stat(path, &s) != 0)
-                        return 0;
-                t2 =s.st_mtime;
-        }
+        t1 = t2 = 0;
+        get_repo_modtime(r1, &t1);
+        get_repo_modtime(r2, &t2);
         return t2-t1;
 }
 
 void cgit_print_repolist()
 {
         int i, columns = 4, hits = 0, header = 0;
         char *last_group = NULL;
 
         if (ctx.cfg.enable_index_links)
                 columns++;
 
         ctx.page.title = ctx.cfg.root_title;
         cgit_print_http_headers(&ctx);
         cgit_print_docstart(&ctx);
         cgit_print_pageheader(&ctx);
 
         if (ctx.cfg.index_header)
                 html_include(ctx.cfg.index_header);
 
         if(ctx.qry.sort)
                 qsort(cgit_repolist.repos,cgit_repolist.count,sizeof(struct cgit_repo),cgit_reposort_modtime);
 
         html("<table summary='repository list' class='list nowrap'>");
         for (i=0; i<cgit_repolist.count; i++) {