ui-repolist: extract repo visibility criteria to separate function

[ps-cgit] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index 4f52e0fc93b9c06be7cad245302712167da09cf0..4912fa55bd5628791f6bc4685f17f4219cc264bf 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -15,7 +15,7 @@ static time_t read_agefile(char *path)
 {
        time_t result;
        size_t size;
 {
        time_t result;
        size_t size;

-       char *buf;
+       char *buf = NULL;

        struct strbuf date_buf = STRBUF_INIT;
 
        if (readfile(path, &buf, &size)) {
        struct strbuf date_buf = STRBUF_INIT;
 
        if (readfile(path, &buf, &size)) {


@@ -106,16 +106,27 @@ static int is_in_url(struct cgit_repo *repo)
        return 0;
 }
 
        return 0;
 }
 

+static int is_visible(struct cgit_repo *repo)
+{
+       if (repo->hide || repo->ignore)
+               return 0;
+       if (!(is_match(repo) && is_in_url(repo)))
+               return 0;
+       return 1;
+}
+

 static void print_sort_header(const char *title, const char *sort)
 {
 static void print_sort_header(const char *title, const char *sort)
 {

+       char *currenturl = cgit_currenturl();

        html("<th class='left'><a href='");
        html("<th class='left'><a href='");

-       html_attr(cgit_currenturl());
+       html_attr(currenturl);

        htmlf("?s=%s", sort);
        if (ctx.qry.search) {
                html("&amp;q=");
                html_url_arg(ctx.qry.search);
        }
        htmlf("'>%s</a></th>", title);
        htmlf("?s=%s", sort);
        if (ctx.qry.search) {
                html("&amp;q=");
                html_url_arg(ctx.qry.search);
        }
        htmlf("'>%s</a></th>", title);

+       free(currenturl);

 }
 
 static void print_header(void)
 }
 
 static void print_header(void)


@@ -276,9 +287,7 @@ void cgit_print_repolist(void)
        html("<table summary='repository list' class='list nowrap'>");
        for (i = 0; i < cgit_repolist.count; i++) {
                ctx.repo = &cgit_repolist.repos[i];
        html("<table summary='repository list' class='list nowrap'>");
        for (i = 0; i < cgit_repolist.count; i++) {
                ctx.repo = &cgit_repolist.repos[i];

-               if (ctx.repo->hide || ctx.repo->ignore)
-                       continue;
-               if (!(is_match(ctx.repo) && is_in_url(ctx.repo)))
+               if (!is_visible(ctx.repo))

                        continue;
                hits++;
                if (hits <= ctx.qry.ofs)
                        continue;
                hits++;
                if (hits <= ctx.qry.ofs)