ui-stats: make cgit_period definitions 'static const'

[cgit.git] / ui-stats.c

diff --git a/ui-stats.c b/ui-stats.c
index f74dc3337bb1cc47df376561dc97848bf93c7f7b..9cd8247e0c1cc5f117052fa0ba47bc4945d8cd8a 100644 (file)
--- a/ui-stats.c
+++ b/ui-stats.c
@@ -1,7 +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"
@@ -9,8 +9,6 @@
 #define SZ_FMT "%zu"
 #endif
 
-#define MONTHS 6
-
 struct authorstat {
        long total;
        struct string_list list;
@@ -83,7 +81,7 @@ static char *pretty_month(struct tm *tm)
 static void trunc_quarter(struct tm *tm)
 {
        trunc_month(tm);
-       while(tm->tm_mon % 3 != 0)
+       while (tm->tm_mon % 3 != 0)
                dec_month(tm);
 }
 
@@ -127,7 +125,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 +136,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 +165,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;
@@ -211,13 +209,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.
  */
-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 +228,9 @@ 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,15 +244,19 @@ 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;
 }
 
-void print_combined_authorrow(struct string_list *authors, int from, int to,
-       const char *name, const char *leftclass, const char *centerclass,
-       const char *rightclass, struct cgit_period *period)
+static void print_combined_authorrow(struct string_list *authors, int from,
+                                    int to, const char *name,
+                                    const char *leftclass,
+                                    const char *centerclass,
+                                    const char *rightclass,
+                                    const struct cgit_period *period)
 {
        struct string_list_item *author;
        struct authorstat *authorstat;
@@ -293,8 +294,8 @@ void print_combined_authorrow(struct string_list *authors, int from, int to,
        htmlf("<td class='%s'>%ld</td></tr>", rightclass, total);
 }
 
-void print_authors(struct string_list *authors, int top,
-                  struct cgit_period *period)
+static void print_authors(struct string_list *authors, int top,
+                         const struct cgit_period *period)
 {
        struct string_list_item *author;
        struct authorstat *authorstat;
@@ -359,31 +360,30 @@ 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("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("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;
 
@@ -392,10 +392,10 @@ void cgit_show_stats(struct cgit_context *ctx)
        html("<form method='get' action=''>");
        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>");
@@ -414,9 +414,9 @@ 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>");