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) (side-by-side diff)
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 @@
+#ifdef NO_C99_FORMAT
+#define SZ_FMT "%u"
+#else
+#define SZ_FMT "%zu"
+#endif
+
#define MONTHS 6
@@ -285,6 +291,6 @@ void print_combined_authorrow(struct string_list *authors, int from, int to,
}
- 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);
}
@@ -337,3 +343,3 @@ void print_authors(struct string_list *authors, int top,
else {
- htmlf("<td>%d</td>", date->util);
+ htmlf("<td>"SZ_FMT"</td>", (size_t)date->util);
total += (size_t)date->util;
@@ -341,3 +347,3 @@ void print_authors(struct string_list *authors, int top,
}
- htmlf("<td class='sum'>%d</td></tr>", total);
+ htmlf("<td class='sum'>%ld</td></tr>", total);
}
@@ -346,3 +352,3 @@ void print_authors(struct string_list *authors, int top,
print_combined_authorrow(authors, top, authors->nr - 1,
- "Others (%d)", "left", "", "sum", period);
+ "Others (%ld)", "left", "", "sum", period);
@@ -369,3 +375,3 @@ void cgit_show_stats(struct cgit_context *ctx)
if (!i) {
- cgit_print_error(fmt("Unknown statistics type: %c", code));
+ cgit_print_error(fmt("Unknown statistics type: %c", code[0]));
return;