Diff options
| author | Bryce Kwon <bryce@brycekwon.com> | |
|---|---|---|
| committer | Bryce Kwon <bryce@brycekwon.com> | |
| commit | ||
| parent | ||
| tree | ||
| download | ||
Word the blob size and binary errors alike
The four pages that refuse a blob over max-blob-size each said it in
their own way, two of them in lower case, and the blame page ended its
binary notice with a full stop no other error carries.
Diffstat (limited to 'source')
| -rw-r--r-- | source/ui-blame.c | 8 | |
| -rw-r--r-- | source/ui-blob.c | 2 | |
| -rw-r--r-- | source/ui-plain.c | 2 | |
| -rw-r--r-- | source/ui-tree.c | 6 |
4 files changed, 7 insertions, 11 deletions
diff --git a/source/ui-blame.c b/source/ui-blame.c index 5d88f94..9395098 100644 --- a/source/ui-blame.c +++ b/source/ui-blame.c @@ -275,10 +275,8 @@ static void print_blame_page(const struct object_id *oid, const char *path, return; } if (ctx.cfg.max_blob_size && size / 1024 > (unsigned long)ctx.cfg.max_blob_size) { - cgit_print_error_page( - 413, "Content Too Large", "blob size (%luKB) exceeds display size limit (%dKB)", - size / 1024, ctx.cfg.max_blob_size - ); + cgit_print_error_page(413, "Content Too Large", "Blob size (%lu KB) exceeds the limit (%d KB)", + size / 1024, ctx.cfg.max_blob_size); return; } @@ -313,7 +311,7 @@ static void print_blame_page(const struct object_id *oid, const char *path, free(ent); } free((void *)sb.final_buf); - html("<div class='error'>blob is binary.</div>"); + html("<div class='error'>Blob is binary</div>"); goto cleanup; } html("<table class='blame blob'>\n<tr>\n"); diff --git a/source/ui-blob.c b/source/ui-blob.c index 4105e48..3c3ba71 100644 --- a/source/ui-blob.c +++ b/source/ui-blob.c @@ -211,7 +211,7 @@ void cgit_print_blob(const char *hex, char *path, const char *head, int file_onl } if (over_size_limit(size)) { - cgit_print_error_page(413, "Content Too Large", "Object size (%luKB) exceeds limit (%dKB)", + cgit_print_error_page(413, "Content Too Large", "Blob size (%lu KB) exceeds the limit (%d KB)", size / 1024, ctx.cfg.max_blob_size); return; } diff --git a/source/ui-plain.c b/source/ui-plain.c index 959b1bf..7db6e07 100644 --- a/source/ui-plain.c +++ b/source/ui-plain.c @@ -61,7 +61,7 @@ static void print_object(const struct object_id *oid, const char *path) // The limit counts kilobytes and is checked before the read, so a huge // blob is kept out of memory rather than noticed once it is there. if (ctx.cfg.max_blob_size && size / 1024 > (unsigned long)ctx.cfg.max_blob_size) { - cgit_print_error_page(413, "Content Too Large", "Object size (%luKB) exceeds limit (%dKB)", + cgit_print_error_page(413, "Content Too Large", "Blob size (%lu KB) exceeds the limit (%d KB)", size / 1024, ctx.cfg.max_blob_size); return; } diff --git a/source/ui-tree.c b/source/ui-tree.c index 5b0cdea..2bb2858 100644 --- a/source/ui-tree.c +++ b/source/ui-tree.c @@ -176,10 +176,8 @@ static bool print_object(const struct object_id *oid, const char *path, } if (ctx.cfg.max_blob_size && size / 1024 > (unsigned long)ctx.cfg.max_blob_size) { - cgit_print_error_page( - 413, "Content Too Large", "blob size (%luKB) exceeds display size limit (%dKB)", - size / 1024, ctx.cfg.max_blob_size - ); + cgit_print_error_page(413, "Content Too Large", "Blob size (%lu KB) exceeds the limit (%d KB)", + size / 1024, ctx.cfg.max_blob_size); return false; } |