| -rw-r--r-- | ui-view.c | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -1,41 +1,43 @@ /* ui-view.c: functions to output _any_ object, given it's sha1 * * Copyright (C) 2006 Lars Hjemli * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ #include "cgit.h" void cgit_print_view(const char *hex) { unsigned char sha1[20]; - char type[20]; + enum object_type type; unsigned char *buf; unsigned long size; if (get_sha1_hex(hex, sha1)){ cgit_print_error(fmt("Bad hex value: %s", hex)); return; } - if (sha1_object_info(sha1, type, &size)){ - cgit_print_error("Bad object name"); + type = sha1_object_info(sha1, &size); + if (type == OBJ_BAD) { + cgit_print_error(fmt("Bad object name: %s", hex)); return; } - buf = read_sha1_file(sha1, type, &size); + buf = read_sha1_file(sha1, &type, &size); if (!buf) { - cgit_print_error("Error reading object"); + cgit_print_error(fmt("Error reading object %s", hex)); return; } buf[size] = '\0'; html("<table class='list'>\n"); - htmlf("<tr class='nohover'><th class='left'>%s %s, %li bytes</th></tr>\n", type, hex, size); + htmlf("<tr class='nohover'><th class='left'>%s %s, %li bytes</th></tr>\n", + typename(type), hex, size); html("<tr><td class='blob'>\n"); html_txt(buf); html("\n</td></tr>\n"); html("</table>\n"); } |