1 files changed, 14 insertions, 12 deletions

diff --git a/ui-commit.c b/ui-commit.c
index bd55a33..8019e36 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -6,8 +6,10 @@
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
+#include "html.h"
+#include "ui-shared.h"
 
 static int files, slots;
 static int total_adds, total_rems, max_changes;
 static int lines_added, lines_removed;
@@ -61,22 +63,22 @@ void print_fileinfo(struct fileinfo *info)
 
 	html("<tr>");
 	htmlf("<td class='mode'>");
 	if (is_null_sha1(info->new_sha1)) {
-		html_filemode(info->old_mode);
+		cgit_print_filemode(info->old_mode);
 	} else {
-		html_filemode(info->new_mode);
+		cgit_print_filemode(info->new_mode);
 	}
 
 	if (info->old_mode != info->new_mode &&
 	    !is_null_sha1(info->old_sha1) &&
 	    !is_null_sha1(info->new_sha1)) {
 		html("<span class='modechange'>[");
-		html_filemode(info->old_mode);
+		cgit_print_filemode(info->old_mode);
 		html("]</span>");
 	}
 	htmlf("</td><td class='%s'>", class);
-	cgit_diff_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev,
+	cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, curr_rev,
 		       NULL, info->new_path);
 	if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
 		htmlf(" (%s from %s)",
 		      info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
@@ -142,9 +144,9 @@ void cgit_print_commit(char *hex)
 	char *tmp;
 	int i;
 
 	if (!hex)
-		hex = cgit_query_head;
+		hex = ctx.qry.head;
 	curr_rev = hex;
 
 	if (get_sha1(hex, sha1)) {
 		cgit_print_error(fmt("Bad object id: %s", hex));
@@ -174,9 +176,9 @@ void cgit_print_commit(char *hex)
 	html("</td></tr>\n");
 	html("<tr><th>tree</th><td colspan='2' class='sha1'>");
 	tmp = xstrdup(hex);
 	cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
-		       cgit_query_head, tmp, NULL);
+		       ctx.qry.head, tmp, NULL);
 	html("</td></tr>\n");
       	for (p = commit->parents; p ; p = p->next) {
 		parent = lookup_commit_reference(p->item->object.sha1);
 		if (!parent) {
@@ -187,18 +189,18 @@ void cgit_print_commit(char *hex)
 		}
 		html("<tr><th>parent</th>"
 		     "<td colspan='2' class='sha1'>");
 		cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
-				 cgit_query_head, sha1_to_hex(p->item->object.sha1));
+				 ctx.qry.head, sha1_to_hex(p->item->object.sha1));
 		html(" (");
-		cgit_diff_link("diff", NULL, NULL, cgit_query_head, hex,
+		cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
 			       sha1_to_hex(p->item->object.sha1), NULL);
 		html(")</td></tr>");
 	}
-	if (cgit_repo->snapshots) {
+	if (ctx.repo->snapshots) {
 		html("<tr><th>download</th><td colspan='2' class='sha1'>");
-		cgit_print_snapshot_links(cgit_query_repo, cgit_query_head,
-					  hex, cgit_repo->snapshots);
+		cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
+					  hex, ctx.repo->snapshots);
 		html("</td></tr>");
 	}
 	html("</table>\n");
 	html("<div class='commit-subject'>");
@@ -217,9 +219,9 @@ void cgit_print_commit(char *hex)
 		html("</table>");
 		html("<div class='diffstat-summary'>");
 		htmlf("%d files changed, %d insertions, %d deletions (",
 		      files, total_adds, total_rems);
-		cgit_diff_link("show diff", NULL, NULL, cgit_query_head, hex,
+		cgit_diff_link("show diff", NULL, NULL, ctx.qry.head, hex,
 			       NULL, NULL);
 		html(")</div>");
 	}
 	cgit_free_commitinfo(info);