git: update to v2.45.1

[ps-cgit] / ui-stats.c

diff --git a/ui-stats.c b/ui-stats.c
index 9cd8247e0c1cc5f117052fa0ba47bc4945d8cd8a..9aed4ac3bf2ba286b5ff889534f64db4633e2176 100644 (file)
--- a/ui-stats.c
+++ b/ui-stats.c
@@ -3,12 +3,6 @@
 #include "html.h"
 #include "ui-shared.h"
 
 #include "html.h"
 #include "ui-shared.h"
 

-#ifdef NO_C99_FORMAT
-#define SZ_FMT "%u"
-#else
-#define SZ_FMT "%zu"
-#endif
-

 struct authorstat {
        long total;
        struct string_list list;
 struct authorstat {
        long total;
        struct string_list list;


@@ -172,8 +166,9 @@ static void add_commit(struct string_list *authors, struct commit *commit,
        struct authorstat *authorstat;
        struct string_list *items;
        char *tmp;
        struct authorstat *authorstat;
        struct string_list *items;
        char *tmp;

-       struct tm *date;
+       struct tm date;

        time_t t;
        time_t t;

+       uintptr_t *counter;

 
        info = cgit_parse_commit(commit);
        tmp = xstrdup(info->author);
 
        info = cgit_parse_commit(commit);
        tmp = xstrdup(info->author);


@@ -185,13 +180,15 @@ static void add_commit(struct string_list *authors, struct commit *commit,
        authorstat = author->util;
        items = &authorstat->list;
        t = info->committer_date;
        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);
        item = string_list_insert(items, tmp);

-       if (item->util)
+       counter = (uintptr_t *)&item->util;
+       if (*counter)

                free(tmp);
                free(tmp);

-       item->util++;
+       (*counter)++;
+

        authorstat->total++;
        cgit_free_commitinfo(info);
 }
        authorstat->total++;
        cgit_free_commitinfo(info);
 }


@@ -218,22 +215,22 @@ static struct string_list collect_stats(const struct cgit_period *period)
        int argc = 3;
        time_t now;
        long i;
        int argc = 3;
        time_t now;
        long i;

-       struct tm *tm;
+       struct tm tm;

        char tmp[11];
 
        time(&now);
        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++)
        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;
        }
        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;
        rev.abbrev = DEFAULT_ABBREV;
        rev.commit_format = CMIT_FMT_DEFAULT;
        rev.max_parents = 1;


@@ -244,8 +241,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);
        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;
                commit->parents = NULL;
        }
        return authors;


@@ -264,21 +260,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 string_list_item *date;
        time_t now;
        long i, j, total, subtotal;

-       struct tm *tm;
+       struct tm tm;

        char *tmp;
 
        time(&now);
        char *tmp;
 
        time(&now);

-       tm = gmtime(&now);
-       period->trunc(tm);
+       gmtime_r(&now, &tm);
+       period->trunc(&tm);

        for (i = 1; i < period->count; i++)
        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++) {
 
        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];
                subtotal = 0;
                for (i = from; i <= to; i++) {
                        author = &authors->items[i];


@@ -286,7 +282,7 @@ static void print_combined_authorrow(struct string_list *authors, int from,
                        items = &authorstat->list;
                        date = string_list_lookup(items, tmp);
                        if (date)
                        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;
                }
                htmlf("<td class='%s'>%ld</td>", centerclass, subtotal);
                total += subtotal;


@@ -303,20 +299,20 @@ static void print_authors(struct string_list *authors, int top,
        struct string_list_item *date;
        time_t now;
        long i, j, total;
        struct string_list_item *date;
        time_t now;
        long i, j, total;

-       struct tm *tm;
+       struct tm tm;

        char *tmp;
 
        time(&now);
        char *tmp;
 
        time(&now);

-       tm = gmtime(&now);
-       period->trunc(tm);
+       gmtime_r(&now, &tm);
+       period->trunc(&tm);

        for (i = 1; i < period->count; i++)
        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++) {
 
        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);
                htmlf("<th>%s</th>", tmp);

-               period->inc(tm);
+               period->inc(&tm);

        }
        html("<th>Total</th></tr>\n");
 
        }
        html("<th>Total</th></tr>\n");
 


@@ -332,16 +328,16 @@ static void print_authors(struct string_list *authors, int top,
                items = &authorstat->list;
                total = 0;
                for (j = 0; j < period->count; j++)
                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++) {
                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>");
                        else {
                        date = string_list_lookup(items, tmp);
                        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);
                        }
                }
                htmlf("<td class='sum'>%ld</td></tr>", total);


@@ -372,11 +368,13 @@ void cgit_show_stats(void)
 
        i = cgit_find_stats_period(code, &period);
        if (!i) {
 
        i = cgit_find_stats_period(code, &period);
        if (!i) {

-               cgit_print_error("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) {
                return;
        }
        if (i > ctx.repo->max_stats) {

-               cgit_print_error("Statistics type disabled: %s", period->name);
+               cgit_print_error_page(400, "Bad request",
+                       "Statistics type disabled: %s", period->name);

                return;
        }
        authors = collect_stats(period);
                return;
        }
        authors = collect_stats(period);


@@ -387,9 +385,10 @@ void cgit_show_stats(void)
        if (!top)
                top = 10;
 
        if (!top)
                top = 10;
 

+       cgit_print_layout_start();

        html("<div class='cgit-panel'>");
        html("<b>stat options</b>");
        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) {
        cgit_add_hidden_formfields(1, 0, "stats");
        html("<table><tr><td colspan='2'/></tr>");
        if (ctx.repo->max_stats > 1) {


@@ -421,5 +420,6 @@ void cgit_show_stats(void)
        }
        html("</h2>");
        print_authors(&authors, top, period);
        }
        html("</h2>");
        print_authors(&authors, top, period);

+       cgit_print_layout_end();

 }
 
 }