ui-shared: rename parameter to cgit_print_snapshot_links()

[cgit.git] / ui-stats.c

diff --git a/ui-stats.c b/ui-stats.c
index 480c8eec33734d71787b17aa30b019e553a79e6d..7acd358d0f1ca7a137ae901481ae36b1d3374cfd 100644 (file)
--- a/ui-stats.c
+++ b/ui-stats.c
@@ -1,15 +1,7 @@
 #include "cgit.h"
+#include "ui-stats.h"
 #include "html.h"
 #include "ui-shared.h"
-#include "ui-stats.h"
-
-#ifdef NO_C99_FORMAT
-#define SZ_FMT "%u"
-#else
-#define SZ_FMT "%zu"
-#endif
-
-#define MONTHS 6
 
 struct authorstat {
        long total;
@@ -127,7 +119,7 @@ static char *pretty_year(struct tm *tm)
        return fmt("%d", tm->tm_year + 1900);
 }
 
-struct cgit_period periods[] = {
+static const struct cgit_period periods[] = {
        {'w', "week", 12, 4, trunc_week, dec_week, inc_week, pretty_week},
        {'m', "month", 12, 4, trunc_month, dec_month, inc_month, pretty_month},
        {'q', "quarter", 12, 4, trunc_quarter, dec_quarter, inc_quarter, pretty_quarter},
@@ -138,7 +130,7 @@ struct cgit_period periods[] = {
  * and update the period pointer to the correcsponding struct.
  * If no matching code is found, return 0.
  */
-int cgit_find_stats_period(const char *expr, struct cgit_period **period)
+int cgit_find_stats_period(const char *expr, const struct cgit_period **period)
 {
        int i;
        char code = '\0';
@@ -167,7 +159,7 @@ const char *cgit_find_stats_periodname(int idx)
 }
 
 static void add_commit(struct string_list *authors, struct commit *commit,
-       struct cgit_period *period)
+       const struct cgit_period *period)
 {
        struct commitinfo *info;
        struct string_list_item *author, *item;
@@ -176,6 +168,7 @@ static void add_commit(struct string_list *authors, struct commit *commit,
        char *tmp;
        struct tm *date;
        time_t t;
+       uintptr_t *counter;
 
        info = cgit_parse_commit(commit);
        tmp = xstrdup(info->author);
@@ -191,9 +184,11 @@ static void add_commit(struct string_list *authors, struct commit *commit,
        period->trunc(date);
        tmp = xstrdup(period->pretty(date));
        item = string_list_insert(items, tmp);
-       if (item->util)
+       counter = (uintptr_t *)&item->util;
+       if (*counter)
                free(tmp);
-       item->util++;
+       (*counter)++;
+
        authorstat->total++;
        cgit_free_commitinfo(info);
 }
@@ -211,13 +206,12 @@ static int cmp_total_commits(const void *a1, const void *a2)
 /* Walk the commit DAG and collect number of commits per author per
  * timeperiod into a nested string_list collection.
  */
-static struct string_list collect_stats(struct cgit_context *ctx,
-                                       struct cgit_period *period)
+static struct string_list collect_stats(const struct cgit_period *period)
 {
        struct string_list authors;
        struct rev_info rev;
        struct commit *commit;
-       const char *argv[] = {NULL, ctx->qry.head, NULL, NULL, NULL, NULL};
+       const char *argv[] = {NULL, ctx.qry.head, NULL, NULL, NULL, NULL};
        int argc = 3;
        time_t now;
        long i;
@@ -231,9 +225,9 @@ static struct string_list collect_stats(struct cgit_context *ctx,
                period->dec(tm);
        strftime(tmp, sizeof(tmp), "%Y-%m-%d", tm);
        argv[2] = xstrdup(fmt("--since=%s", tmp));
-       if (ctx->qry.path) {
+       if (ctx.qry.path) {
                argv[3] = "--";
-               argv[4] = ctx->qry.path;
+               argv[4] = ctx.qry.path;
                argc += 2;
        }
        init_revisions(&rev, NULL);
@@ -247,8 +241,9 @@ static struct string_list collect_stats(struct cgit_context *ctx,
        memset(&authors, 0, sizeof(authors));
        while ((commit = get_revision(&rev)) != NULL) {
                add_commit(&authors, commit, period);
-               free(commit->buffer);
+               free_commit_buffer(commit);
                free_commit_list(commit->parents);
+               commit->parents = NULL;
        }
        return authors;
 }
@@ -258,7 +253,7 @@ static void print_combined_authorrow(struct string_list *authors, int from,
                                     const char *leftclass,
                                     const char *centerclass,
                                     const char *rightclass,
-                                    struct cgit_period *period)
+                                    const struct cgit_period *period)
 {
        struct string_list_item *author;
        struct authorstat *authorstat;
@@ -288,7 +283,7 @@ static void print_combined_authorrow(struct string_list *authors, int from,
                        items = &authorstat->list;
                        date = string_list_lookup(items, tmp);
                        if (date)
-                               subtotal += (size_t)date->util;
+                               subtotal += (uintptr_t)date->util;
                }
                htmlf("<td class='%s'>%ld</td>", centerclass, subtotal);
                total += subtotal;
@@ -297,7 +292,7 @@ static void print_combined_authorrow(struct string_list *authors, int from,
 }
 
 static void print_authors(struct string_list *authors, int top,
-                         struct cgit_period *period)
+                         const struct cgit_period *period)
 {
        struct string_list_item *author;
        struct authorstat *authorstat;
@@ -342,8 +337,8 @@ static void print_authors(struct string_list *authors, int top,
                        if (!date)
                                html("<td>0</td>");
                        else {
-                               htmlf("<td>"SZ_FMT"</td>", (size_t)date->util);
-                               total += (size_t)date->util;
+                               htmlf("<td>%lu</td>", (uintptr_t)date->util);
+                               total += (uintptr_t)date->util;
                        }
                }
                htmlf("<td class='sum'>%ld</td></tr>", total);
@@ -362,43 +357,45 @@ static void print_authors(struct string_list *authors, int top,
  * for each author is another string_list which is used to calculate the
  * number of commits per time-interval.
  */
-void cgit_show_stats(struct cgit_context *ctx)
+void cgit_show_stats(void)
 {
        struct string_list authors;
-       struct cgit_period *period;
+       const struct cgit_period *period;
        int top, i;
        const char *code = "w";
 
-       if (ctx->qry.period)
-               code = ctx->qry.period;
+       if (ctx.qry.period)
+               code = ctx.qry.period;
 
        i = cgit_find_stats_period(code, &period);
        if (!i) {
-               cgit_print_error(fmt("Unknown statistics type: %c", code[0]));
+               cgit_print_error_page(404, "Not found",
+                       "Unknown statistics type: %c", code[0]);
                return;
        }
-       if (i > ctx->repo->max_stats) {
-               cgit_print_error(fmt("Statistics type disabled: %s",
-                                    period->name));
+       if (i > ctx.repo->max_stats) {
+               cgit_print_error_page(400, "Bad request",
+                       "Statistics type disabled: %s", period->name);
                return;
        }
-       authors = collect_stats(ctx, period);
+       authors = collect_stats(period);
        qsort(authors.items, authors.nr, sizeof(struct string_list_item),
                cmp_total_commits);
 
-       top = ctx->qry.ofs;
+       top = ctx.qry.ofs;
        if (!top)
                top = 10;
 
+       cgit_print_layout_start();
        html("<div class='cgit-panel'>");
        html("<b>stat options</b>");
-       html("<form method='get' action=''>");
+       html("<form method='get'>");
        cgit_add_hidden_formfields(1, 0, "stats");
        html("<table><tr><td colspan='2'/></tr>");
-       if (ctx->repo->max_stats > 1) {
+       if (ctx.repo->max_stats > 1) {
                html("<tr><td class='label'>Period:</td>");
                html("<td class='ctrl'><select name='period' onchange='this.form.submit();'>");
-               for (i = 0; i < ctx->repo->max_stats; i++)
+               for (i = 0; i < ctx.repo->max_stats; i++)
                        html_option(fmt("%c", periods[i].code),
                                    periods[i].name, fmt("%c", period->code));
                html("</select></td></tr>");
@@ -417,12 +414,13 @@ void cgit_show_stats(struct cgit_context *ctx)
        html("</form>");
        html("</div>");
        htmlf("<h2>Commits per author per %s", period->name);
-       if (ctx->qry.path) {
+       if (ctx.qry.path) {
                html(" (path '");
-               html_txt(ctx->qry.path);
+               html_txt(ctx.qry.path);
                html("')");
        }
        html("</h2>");
        print_authors(&authors, top, period);
+       cgit_print_layout_end();
 }