ui-blame: free read_sha1_file() buffer after use

[cgit.git] / ui-stats.c

diff --git a/ui-stats.c b/ui-stats.c
index 50c2540c860b6275b06b84576ecfd81c032e208d..7acd358d0f1ca7a137ae901481ae36b1d3374cfd 100644 (file)
--- a/ui-stats.c
+++ b/ui-stats.c
@@ -1,11 +1,7 @@
-#include <string-list.h>
-

 #include "cgit.h"
 #include "cgit.h"

+#include "ui-stats.h"

 #include "html.h"
 #include "ui-shared.h"
 #include "html.h"
 #include "ui-shared.h"

-#include "ui-stats.h"
-
-#define MONTHS 6

 
 struct authorstat {
        long total;
 
 struct authorstat {
        long total;


@@ -19,21 +15,21 @@ static void trunc_week(struct tm *tm)
 {
        time_t t = timegm(tm);
        t -= ((tm->tm_wday + 6) % 7) * DAY_SECS;
 {
        time_t t = timegm(tm);
        t -= ((tm->tm_wday + 6) % 7) * DAY_SECS;

-       gmtime_r(&t, tm);       
+       gmtime_r(&t, tm);

 }
 
 static void dec_week(struct tm *tm)
 {
        time_t t = timegm(tm);
        t -= WEEK_SECS;
 }
 
 static void dec_week(struct tm *tm)
 {
        time_t t = timegm(tm);
        t -= WEEK_SECS;

-       gmtime_r(&t, tm);       
+       gmtime_r(&t, tm);

 }
 
 static void inc_week(struct tm *tm)
 {
        time_t t = timegm(tm);
        t += WEEK_SECS;
 }
 
 static void inc_week(struct tm *tm)
 {
        time_t t = timegm(tm);
        t += WEEK_SECS;

-       gmtime_r(&t, tm);       
+       gmtime_r(&t, tm);

 }
 
 static char *pretty_week(struct tm *tm)
 }
 
 static char *pretty_week(struct tm *tm)


@@ -79,7 +75,7 @@ static char *pretty_month(struct tm *tm)
 static void trunc_quarter(struct tm *tm)
 {
        trunc_month(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);
 }
 
                dec_month(tm);
 }
 


@@ -123,7 +119,7 @@ static char *pretty_year(struct tm *tm)
        return fmt("%d", tm->tm_year + 1900);
 }
 
        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},
        {'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},


@@ -134,7 +130,7 @@ struct cgit_period periods[] = {
  * and update the period pointer to the correcsponding struct.
  * If no matching code is found, return 0.
  */
  * 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';
 {
        int i;
        char code = '\0';


@@ -149,7 +145,7 @@ int cgit_find_stats_period(const char *expr, struct cgit_period **period)
                if (periods[i].code == code || !strcmp(periods[i].name, expr)) {
                        if (period)
                                *period = &periods[i];
                if (periods[i].code == code || !strcmp(periods[i].name, expr)) {
                        if (period)
                                *period = &periods[i];

-                       return i+1;
+                       return i + 1;

                }
        return 0;
 }
                }
        return 0;
 }


@@ -163,7 +159,7 @@ const char *cgit_find_stats_periodname(int idx)
 }
 
 static void add_commit(struct string_list *authors, struct commit *commit,
 }
 
 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;
 {
        struct commitinfo *info;
        struct string_list_item *author, *item;


@@ -172,6 +168,7 @@ static void add_commit(struct string_list *authors, struct commit *commit,
        char *tmp;
        struct tm *date;
        time_t t;
        char *tmp;
        struct tm *date;
        time_t t;

+       uintptr_t *counter;

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


@@ -187,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);
        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);
                free(tmp);

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

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


@@ -207,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.
  */
 /* 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;
 {
        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;
        int argc = 3;
        time_t now;
        long i;


@@ -227,15 +225,15 @@ 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));
                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[3] = "--";

-               argv[4] = ctx->qry.path;
+               argv[4] = ctx.qry.path;

                argc += 2;
        }
        init_revisions(&rev, NULL);
        rev.abbrev = DEFAULT_ABBREV;
        rev.commit_format = CMIT_FMT_DEFAULT;
                argc += 2;
        }
        init_revisions(&rev, NULL);
        rev.abbrev = DEFAULT_ABBREV;
        rev.commit_format = CMIT_FMT_DEFAULT;

-       rev.no_merges = 1;
+       rev.max_parents = 1;

        rev.verbose_header = 1;
        rev.show_root_diff = 0;
        setup_revisions(argc, argv, &rev, NULL);
        rev.verbose_header = 1;
        rev.show_root_diff = 0;
        setup_revisions(argc, argv, &rev, NULL);


@@ -243,15 +241,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);
        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);
                free_commit_list(commit->parents);

+               commit->parents = NULL;

        }
        return authors;
 }
 
        }
        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;
 {
        struct string_list_item *author;
        struct authorstat *authorstat;


@@ -281,16 +283,16 @@ void print_combined_authorrow(struct string_list *authors, int from, int to,
                        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'>%d</td>", centerclass, subtotal);
+               htmlf("<td class='%s'>%ld</td>", centerclass, subtotal);

                total += subtotal;
        }
                total += subtotal;
        }

-       htmlf("<td class='%s'>%d</td></tr>", rightclass, total);
+       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;
 {
        struct string_list_item *author;
        struct authorstat *authorstat;


@@ -335,16 +337,16 @@ void print_authors(struct string_list *authors, int top,
                        if (!date)
                                html("<td>0</td>");
                        else {
                        if (!date)
                                html("<td>0</td>");
                        else {

-                               htmlf("<td>%d</td>", date->util);
-                               total += (size_t)date->util;
+                               htmlf("<td>%lu</td>", (uintptr_t)date->util);
+                               total += (uintptr_t)date->util;

                        }
                }
                        }
                }

-               htmlf("<td class='sum'>%d</td></tr>", total);
+               htmlf("<td class='sum'>%ld</td></tr>", total);

        }
 
        if (top < authors->nr)
                print_combined_authorrow(authors, top, authors->nr - 1,
        }
 
        if (top < authors->nr)
                print_combined_authorrow(authors, top, authors->nr - 1,

-                       "Others (%d)", "left", "", "sum", period);
+                       "Others (%ld)", "left", "", "sum", period);

 
        print_combined_authorrow(authors, 0, authors->nr - 1, "Total",
                "total", "sum", "sum", period);
 
        print_combined_authorrow(authors, 0, authors->nr - 1, "Total",
                "total", "sum", "sum", period);


@@ -355,64 +357,70 @@ 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.
  */
  * 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 string_list authors;

-       struct cgit_period *period;
+       const struct cgit_period *period;

        int top, i;
        const char *code = "w";
 
        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) {
 
        i = cgit_find_stats_period(code, &period);
        if (!i) {

-               cgit_print_error(fmt("Unknown statistics type: %c", code));
+               cgit_print_error_page(404, "Not found",
+                       "Unknown statistics type: %c", code[0]);

                return;
        }
                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;
        }
                return;
        }

-       authors = collect_stats(ctx, period);
+       authors = collect_stats(period);

        qsort(authors.items, authors.nr, sizeof(struct string_list_item),
                cmp_total_commits);
 
        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;
        if (!top)
                top = 10;

+
+       cgit_print_layout_start();
+       html("<div class='cgit-panel'>");
+       html("<b>stat options</b>");
+       html("<form method='get'>");
+       cgit_add_hidden_formfields(1, 0, "stats");
+       html("<table><tr><td colspan='2'/></tr>");
+       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++)
+                       html_option(fmt("%c", periods[i].code),
+                                   periods[i].name, fmt("%c", period->code));
+               html("</select></td></tr>");
+       }
+       html("<tr><td class='label'>Authors:</td>");
+       html("<td class='ctrl'><select name='ofs' onchange='this.form.submit();'>");
+       html_intoption(10, "10", top);
+       html_intoption(25, "25", top);
+       html_intoption(50, "50", top);
+       html_intoption(100, "100", top);
+       html_intoption(-1, "all", top);
+       html("</select></td></tr>");
+       html("<tr><td/><td class='ctrl'>");
+       html("<noscript><input type='submit' value='Reload'/></noscript>");
+       html("</td></tr></table>");
+       html("</form>");
+       html("</div>");

        htmlf("<h2>Commits per author per %s", period->name);
        htmlf("<h2>Commits per author per %s", period->name);

-       if (ctx->qry.path) {
+       if (ctx.qry.path) {

                html(" (path '");
                html(" (path '");

-               html_txt(ctx->qry.path);
+               html_txt(ctx.qry.path);

                html("')");
        }
        html("</h2>");
                html("')");
        }
        html("</h2>");

-
-       html("<form method='get' action='' style='float: right; text-align: right;'>");
-       cgit_add_hidden_formfields(1, 0, "stats");
-       if (ctx->repo->max_stats > 1) {
-               html("Period: ");
-               html("<select name='period' onchange='this.form.submit();'>");
-               for (i = 0; i < ctx->repo->max_stats; i++)
-                       htmlf("<option value='%c'%s>%s</option>",
-                               periods[i].code,
-                               period == &periods[i] ? " selected" : "",
-                               periods[i].name);
-               html("</select><br/><br/>");
-       }
-       html("Authors: ");
-       html("");
-       html("<select name='ofs' onchange='this.form.submit();'>");
-       htmlf("<option value='10'%s>10</option>", top == 10 ? " selected" : "");
-       htmlf("<option value='25'%s>25</option>", top == 25 ? " selected" : "");
-       htmlf("<option value='50'%s>50</option>", top == 50 ? " selected" : "");
-       htmlf("<option value='100'%s>100</option>", top == 100 ? " selected" : "");
-       htmlf("<option value='-1'%s>All</option>", top == -1 ? " selected" : "");
-       html("</select>");
-       html("<noscript>&nbsp;&nbsp;<input type='submit' value='Reload'/></noscript>");
-       html("</form>");

        print_authors(&authors, top, period);
        print_authors(&authors, top, period);

+       cgit_print_layout_end();

 }
 
 }