git: update to v2.46.0

[ps-cgit] / ui-stats.c

diff --git a/ui-stats.c b/ui-stats.c
index a9c13fd4c5e930278ce784960fb85f9234dd0a81..02c60efa2a5c9ff1f5a168acb2459f79e778f51c 100644 (file)
--- a/ui-stats.c
+++ b/ui-stats.c
@@ -1,3 +1,13 @@
+/* ui-stats.c: generate stats view
+ *
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
+ *
+ * Licensed under GNU General Public License v2
+ *   (see COPYING for full license text)
+ */
+
+#define USE_THE_REPOSITORY_VARIABLE
+
 #include "cgit.h"
 #include "ui-stats.h"
 #include "html.h"
@@ -166,7 +176,7 @@ static void add_commit(struct string_list *authors, struct commit *commit,
        struct authorstat *authorstat;
        struct string_list *items;
        char *tmp;
-       struct tm *date;
+       struct tm date;
        time_t t;
        uintptr_t *counter;
 
@@ -180,13 +190,13 @@ static void add_commit(struct string_list *authors, struct commit *commit,
        authorstat = author->util;
        items = &authorstat->list;
        t = info->committer_date;
-       date = gmtime(&t);
-       period->trunc(date);
-       tmp = xstrdup(period->pretty(date));
+       gmtime_r(&t, &date);
+       period->trunc(&date);
+       tmp = xstrdup(period->pretty(&date));
        item = string_list_insert(items, tmp);
-       if (item->util)
-               free(tmp);
        counter = (uintptr_t *)&item->util;
+       if (*counter)
+               free(tmp);
        (*counter)++;
 
        authorstat->total++;
@@ -215,22 +225,22 @@ static struct string_list collect_stats(const struct cgit_period *period)
        int argc = 3;
        time_t now;
        long i;
-       struct tm *tm;
+       struct tm tm;
        char tmp[11];
 
        time(&now);
-       tm = gmtime(&now);
-       period->trunc(tm);
+       gmtime_r(&now, &tm);
+       period->trunc(&tm);
        for (i = 1; i < period->count; i++)
-               period->dec(tm);
-       strftime(tmp, sizeof(tmp), "%Y-%m-%d", tm);
+               period->dec(&tm);
+       strftime(tmp, sizeof(tmp), "%Y-%m-%d", &tm);
        argv[2] = xstrdup(fmt("--since=%s", tmp));
        if (ctx.qry.path) {
                argv[3] = "--";
                argv[4] = ctx.qry.path;
                argc += 2;
        }
-       init_revisions(&rev, NULL);
+       repo_init_revisions(the_repository, &rev, NULL);
        rev.abbrev = DEFAULT_ABBREV;
        rev.commit_format = CMIT_FMT_DEFAULT;
        rev.max_parents = 1;
@@ -241,8 +251,7 @@ static struct string_list collect_stats(const struct cgit_period *period)
        memset(&authors, 0, sizeof(authors));
        while ((commit = get_revision(&rev)) != NULL) {
                add_commit(&authors, commit, period);
-               free_commit_buffer(commit);
-               free_commit_list(commit->parents);
+               release_commit_memory(the_repository->parsed_objects, commit);
                commit->parents = NULL;
        }
        return authors;
@@ -261,21 +270,21 @@ static void print_combined_authorrow(struct string_list *authors, int from,
        struct string_list_item *date;
        time_t now;
        long i, j, total, subtotal;
-       struct tm *tm;
+       struct tm tm;
        char *tmp;
 
        time(&now);
-       tm = gmtime(&now);
-       period->trunc(tm);
+       gmtime_r(&now, &tm);
+       period->trunc(&tm);
        for (i = 1; i < period->count; i++)
-               period->dec(tm);
+               period->dec(&tm);
 
        total = 0;
        htmlf("<tr><td class='%s'>%s</td>", leftclass,
                fmt(name, to - from + 1));
        for (j = 0; j < period->count; j++) {
-               tmp = period->pretty(tm);
-               period->inc(tm);
+               tmp = period->pretty(&tm);
+               period->inc(&tm);
                subtotal = 0;
                for (i = from; i <= to; i++) {
                        author = &authors->items[i];
@@ -300,20 +309,20 @@ static void print_authors(struct string_list *authors, int top,
        struct string_list_item *date;
        time_t now;
        long i, j, total;
-       struct tm *tm;
+       struct tm tm;
        char *tmp;
 
        time(&now);
-       tm = gmtime(&now);
-       period->trunc(tm);
+       gmtime_r(&now, &tm);
+       period->trunc(&tm);
        for (i = 1; i < period->count; i++)
-               period->dec(tm);
+               period->dec(&tm);
 
        html("<table class='stats'><tr><th>Author</th>");
        for (j = 0; j < period->count; j++) {
-               tmp = period->pretty(tm);
+               tmp = period->pretty(&tm);
                htmlf("<th>%s</th>", tmp);
-               period->inc(tm);
+               period->inc(&tm);
        }
        html("<th>Total</th></tr>\n");
 
@@ -329,10 +338,10 @@ static void print_authors(struct string_list *authors, int top,
                items = &authorstat->list;
                total = 0;
                for (j = 0; j < period->count; j++)
-                       period->dec(tm);
+                       period->dec(&tm);
                for (j = 0; j < period->count; j++) {
-                       tmp = period->pretty(tm);
-                       period->inc(tm);
+                       tmp = period->pretty(&tm);
+                       period->inc(&tm);
                        date = string_list_lookup(items, tmp);
                        if (!date)
                                html("<td>0</td>");
@@ -389,7 +398,7 @@ void cgit_show_stats(void)
        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) {