Convert cgit_print_error to a variadic function

[cgit.git] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index dead1bfe5fea732d7bd4444a9873d81b96a8faae..76fe71a9a4bfca98c8340deba3b8ee68cb69b9c3 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -8,11 +8,12 @@
  */
 
 #include "cgit.h"
+#include "ui-repolist.h"
 #include "html.h"
 #include "ui-shared.h"
 #include <strings.h>
 
-time_t read_agefile(char *path)
+static time_t read_agefile(char *path)
 {
        time_t result;
        size_t size;
@@ -76,7 +77,7 @@ static void print_modtime(struct cgit_repo *repo)
                cgit_print_age(t, -1, NULL);
 }
 
-int is_match(struct cgit_repo *repo)
+static int is_match(struct cgit_repo *repo)
 {
        if (!ctx.qry.search)
                return 1;
@@ -91,7 +92,7 @@ int is_match(struct cgit_repo *repo)
        return 0;
 }
 
-int is_in_url(struct cgit_repo *repo)
+static int is_in_url(struct cgit_repo *repo)
 {
        if (!ctx.qry.url)
                return 1;
@@ -100,7 +101,7 @@ int is_in_url(struct cgit_repo *repo)
        return 0;
 }
 
-void print_sort_header(const char *title, const char *sort)
+static void print_sort_header(const char *title, const char *sort)
 {
        htmlf("<th class='left'><a href='%s?s=%s", cgit_rooturl(), sort);
        if (ctx.qry.search) {
@@ -110,12 +111,13 @@ void print_sort_header(const char *title, const char *sort)
        htmlf("'>%s</a></th>", title);
 }
 
-void print_header(int columns)
+static void print_header()
 {
        html("<tr class='nohover'>");
        print_sort_header("Name", "name");
        print_sort_header("Description", "desc");
-       print_sort_header("Owner", "owner");
+       if (ctx.cfg.enable_index_owner)
+               print_sort_header("Owner", "owner");
        print_sort_header("Idle", "idle");
        if (ctx.cfg.enable_index_links)
                html("<th class='left'>Links</th>");
@@ -123,17 +125,19 @@ void print_header(int columns)
 }
 
 
-void print_pager(int items, int pagelen, char *search, char *sort)
+static void print_pager(int items, int pagelen, char *search, char *sort)
 {
        int i, ofs;
        char *class = NULL;
-       html("<div class='pager'>");
-       for(i = 0, ofs = 0; ofs < items; i++, ofs = i * pagelen) {
+       html("<ul class='pager'>");
+       for (i = 0, ofs = 0; ofs < items; i++, ofs = i * pagelen) {
                class = (ctx.qry.ofs == ofs) ? "current" : NULL;
-               cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), class,
-                               search, sort, ofs);
+               html("<li>");
+               cgit_index_link(fmt("[%d]", i + 1), fmt("Page %d", i + 1),
+                               class, search, sort, ofs);
+               html("</li>");
        }
-       html("</div>");
+       html("</ul>");
 }
 
 static int cmp(const char *s1, const char *s2)
@@ -222,7 +226,7 @@ struct sortcolumn sortcolumn[] = {
        {NULL, NULL}
 };
 
-int sort_repolist(char *field)
+static int sort_repolist(char *field)
 {
        struct sortcolumn *column;
 
@@ -239,13 +243,15 @@ int sort_repolist(char *field)
 
 void cgit_print_repolist()
 {
-       int i, columns = 4, hits = 0, header = 0;
+       int i, columns = 3, hits = 0, header = 0;
        char *last_section = NULL;
        char *section;
        int sorted = 0;
 
        if (ctx.cfg.enable_index_links)
-               columns++;
+               ++columns;
+       if (ctx.cfg.enable_index_owner)
+               ++columns;
 
        ctx.page.title = ctx.cfg.root_title;
        cgit_print_http_headers(&ctx);
@@ -255,13 +261,13 @@ void cgit_print_repolist()
        if (ctx.cfg.index_header)
                html_include(ctx.cfg.index_header);
 
-       if(ctx.qry.sort)
+       if (ctx.qry.sort)
                sorted = sort_repolist(ctx.qry.sort);
        else if (ctx.cfg.section_sort)
                sort_repolist("section");
 
        html("<table summary='repository list' class='list nowrap'>");
-       for (i=0; i<cgit_repolist.count; i++) {
+       for (i = 0; i < cgit_repolist.count; i++) {
                ctx.repo = &cgit_repolist.repos[i];
                if (!(is_match(ctx.repo) && is_in_url(ctx.repo)))
                        continue;
@@ -271,7 +277,7 @@ void cgit_print_repolist()
                if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count)
                        continue;
                if (!header++)
-                       print_header(columns);
+                       print_header();
                section = ctx.repo->section;
                if (section && !strcmp(section, ""))
                        section = NULL;
@@ -294,8 +300,10 @@ void cgit_print_repolist()
                html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
                html_link_close();
                html("</td><td>");
-               html_txt(ctx.repo->owner);
-               html("</td><td>");
+               if (ctx.cfg.enable_index_owner) {
+                       html_txt(ctx.repo->owner);
+                       html("</td><td>");
+               }
                print_modtime(ctx.repo);
                html("</td>");
                if (ctx.cfg.enable_index_links) {