summaryrefslogtreecommitdiffabout
path: root/ui-stats.c
authorMark Lodato <lodatom@gmail.com>2010-09-04 15:30:18 (UTC)
committer Mark Lodato <lodatom@gmail.com>2010-09-04 15:35:38 (UTC)
commite4ddc8f72b5a7d8c55a6c2042c7b7f945ba4b1a2 (patch) (unidiff)
tree2ade0bb45e15ad5466ca4d3433201477f0c9214e /ui-stats.c
parenta4c58d92bfee0cf2e35ab1c5e828a6d790108a69 (diff)
downloadcgit-e4ddc8f72b5a7d8c55a6c2042c7b7f945ba4b1a2.zip
cgit-e4ddc8f72b5a7d8c55a6c2042c7b7f945ba4b1a2.tar.gz
cgit-e4ddc8f72b5a7d8c55a6c2042c7b7f945ba4b1a2.tar.bz2
fix errors in printf-style format strings
There were many places where the arguments to a printf-like function did not match the format string. Mostly, these were a missing 'l' flag, but there were three exceptions: - In ui-stats.c, a size_t argument must be printed. C99 has the "%zu" flag for this purpose, but not all compilers support this. Therefore, we mimic what git does - use a NO_C99_FORMAT Makefile variable. - In ui-stats.c, cgit_print_error() was called with a pointer instead of a character. - In ui-log.c, the "columns" argument was never used. Signed-off-by: Mark Lodato <lodatom@gmail.com>
Diffstat (limited to 'ui-stats.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-stats.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/ui-stats.c b/ui-stats.c
index 50c2540..946a6ea 100644
--- a/ui-stats.c
+++ b/ui-stats.c
@@ -7,2 +7,8 @@
7 7
8#ifdef NO_C99_FORMAT
9#define SZ_FMT "%u"
10#else
11#define SZ_FMT "%zu"
12#endif
13
8#define MONTHS 6 14#define MONTHS 6
@@ -285,6 +291,6 @@ void print_combined_authorrow(struct string_list *authors, int from, int to,
285 } 291 }
286 htmlf("<td class='%s'>%d</td>", centerclass, subtotal); 292 htmlf("<td class='%s'>%ld</td>", centerclass, subtotal);
287 total += subtotal; 293 total += subtotal;
288 } 294 }
289 htmlf("<td class='%s'>%d</td></tr>", rightclass, total); 295 htmlf("<td class='%s'>%ld</td></tr>", rightclass, total);
290} 296}
@@ -337,3 +343,3 @@ void print_authors(struct string_list *authors, int top,
337 else { 343 else {
338 htmlf("<td>%d</td>", date->util); 344 htmlf("<td>"SZ_FMT"</td>", (size_t)date->util);
339 total += (size_t)date->util; 345 total += (size_t)date->util;
@@ -341,3 +347,3 @@ void print_authors(struct string_list *authors, int top,
341 } 347 }
342 htmlf("<td class='sum'>%d</td></tr>", total); 348 htmlf("<td class='sum'>%ld</td></tr>", total);
343 } 349 }
@@ -346,3 +352,3 @@ void print_authors(struct string_list *authors, int top,
346 print_combined_authorrow(authors, top, authors->nr - 1, 352 print_combined_authorrow(authors, top, authors->nr - 1,
347 "Others (%d)", "left", "", "sum", period); 353 "Others (%ld)", "left", "", "sum", period);
348 354
@@ -369,3 +375,3 @@ void cgit_show_stats(struct cgit_context *ctx)
369 if (!i) { 375 if (!i) {
370 cgit_print_error(fmt("Unknown statistics type: %c", code)); 376 cgit_print_error(fmt("Unknown statistics type: %c", code[0]));
371 return; 377 return;