1 files changed, 12 insertions, 8 deletions

diff --git a/ui-stats.c b/ui-stats.c
index 50c2540..2a0c174 100644
--- a/ui-stats.c
+++ b/ui-stats.c
@@ -1,31 +1,35 @@
-#include <string-list.h>
-
 #include "cgit.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;
         struct string_list list;
 };
 
 #define DAY_SECS (60 * 60 * 24)
 #define WEEK_SECS (DAY_SECS * 7)
 
 static void trunc_week(struct tm *tm)
 {
         time_t t = timegm(tm);
         t -= ((tm->tm_wday + 6) % 7) * DAY_SECS;
                 gmtime_r(&t, tm);
 }
 
 static void dec_week(struct tm *tm)
 {
         time_t t = timegm(tm);
         t -= WEEK_SECS;
                 gmtime_r(&t, tm);
 }
 
@@ -262,133 +266,133 @@ void print_combined_authorrow(struct string_list *authors, int from, int to,
         struct tm *tm;
         char *tmp;
 
         time(&now);
         tm = gmtime(&now);
         period->trunc(tm);
         for (i = 1; i < period->count; i++)
                 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);
                 subtotal = 0;
                 for (i = from; i <= to; i++) {
                         author = &authors->items[i];
                         authorstat = author->util;
                         items = &authorstat->list;
                         date = string_list_lookup(items, tmp);
                         if (date)
                                 subtotal += (size_t)date->util;
                 }
-                htmlf("<td class='%s'>%d</td>", centerclass, subtotal);
+                htmlf("<td class='%s'>%ld</td>", centerclass, 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)
 {
         struct string_list_item *author;
         struct authorstat *authorstat;
         struct string_list *items;
         struct string_list_item *date;
         time_t now;
         long i, j, total;
         struct tm *tm;
         char *tmp;
 
         time(&now);
         tm = gmtime(&now);
         period->trunc(tm);
         for (i = 1; i < period->count; i++)
                 period->dec(tm);
 
         html("<table class='stats'><tr><th>Author</th>");
         for (j = 0; j < period->count; j++) {
                 tmp = period->pretty(tm);
                 htmlf("<th>%s</th>", tmp);
                 period->inc(tm);
         }
         html("<th>Total</th></tr>\n");
 
         if (top <= 0 || top > authors->nr)
                 top = authors->nr;
 
         for (i = 0; i < top; i++) {
                 author = &authors->items[i];
                 html("<tr><td class='left'>");
                 html_txt(author->string);
                 html("</td>");
                 authorstat = author->util;
                 items = &authorstat->list;
                 total = 0;
                 for (j = 0; j < period->count; j++)
                         period->dec(tm);
                 for (j = 0; j < period->count; j++) {
                         tmp = period->pretty(tm);
                         period->inc(tm);
                         date = string_list_lookup(items, tmp);
                         if (!date)
                                 html("<td>0</td>");
                         else {
-                                htmlf("<td>%d</td>", date->util);
+                                htmlf("<td>"SZ_FMT"</td>", (size_t)date->util);
                                 total += (size_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,
-                        "Others (%d)", "left", "", "sum", period);
+                        "Others (%ld)", "left", "", "sum", period);
 
         print_combined_authorrow(authors, 0, authors->nr - 1, "Total",
                 "total", "sum", "sum", period);
         html("</table>");
 }
 
 /* Create a sorted string_list with one entry per author. The util-field
  * 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)
 {
         struct string_list authors;
         struct cgit_period *period;
         int top, i;
         const char *code = "w";
 
         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));
+                cgit_print_error(fmt("Unknown statistics type: %c", code[0]));
                 return;
         }
         if (i > ctx->repo->max_stats) {
                 cgit_print_error(fmt("Statistics type disabled: %s",
                                      period->name));
                 return;
         }
         authors = collect_stats(ctx, period);
         qsort(authors.items, authors.nr, sizeof(struct string_list_item),
                 cmp_total_commits);
 
         top = ctx->qry.ofs;
         if (!top)
                 top = 10;
         htmlf("<h2>Commits per author per %s", period->name);
         if (ctx->qry.path) {
                 html(" (path '");
                 html_txt(ctx->qry.path);
                 html("')");
         }
         html("</h2>");
 
         html("<form method='get' action='' style='float: right; text-align: right;'>");
         cgit_add_hidden_formfields(1, 0, "stats");