Introduce struct cgit_context

This struct will hold all the cgit runtime information currently found in
a multitude of global variables.

The first cleanup removes all querystring-related variables.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/ui-log.c b/ui-log.c
index a41d2b2..a39474b 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -28,25 +28,25 @@ void inspect_files(struct diff_filepair *pair)
         if (cgit_repo->enable_log_linecount)
                 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
 }
 
 void print_commit(struct commit *commit)
 {
         struct commitinfo *info;
 
         info = cgit_parse_commit(commit);
         html("<tr><td>");
         cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
         html("</td><td>");
-        cgit_commit_link(info->subject, NULL, NULL, cgit_query_head,
+        cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
                          sha1_to_hex(commit->object.sha1));
         if (cgit_repo->enable_log_filecount) {
                 files = 0;
                 add_lines = 0;
                 rem_lines = 0;
                 cgit_diff_commit(commit, inspect_files);
                 html("</td><td class='right'>");
                 htmlf("%d", files);
                 if (cgit_repo->enable_log_linecount) {
                         html("</td><td class='right'>");
                         htmlf("-%d/+%d", rem_lines, add_lines);
                 }
@@ -58,25 +58,25 @@ void print_commit(struct commit *commit)
 }
 
 
 void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, char *path, int pager)
 {
         struct rev_info rev;
         struct commit *commit;
         const char *argv[] = {NULL, tip, NULL, NULL, NULL};
         int argc = 2;
         int i;
 
         if (!tip)
-                argv[1] = cgit_query_head;
+                argv[1] = ctx.qry.head;
 
         if (grep && pattern && (!strcmp(grep, "grep") ||
                                 !strcmp(grep, "author") ||
                                 !strcmp(grep, "committer")))
                 argv[argc++] = fmt("--%s=%s", grep, pattern);
 
         if (path) {
                 argv[argc++] = "--";
                 argv[argc++] = path;
         }
         init_revisions(&rev, NULL);
         rev.abbrev = DEFAULT_ABBREV;
@@ -114,27 +114,27 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
         for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
                 print_commit(commit);
                 free(commit->buffer);
                 commit->buffer = NULL;
                 free_commit_list(commit->parents);
                 commit->parents = NULL;
         }
         html("</table>\n");
 
         if (pager) {
                 html("<div class='pager'>");
                 if (ofs > 0) {
-                        cgit_log_link("[prev]", NULL, NULL, cgit_query_head,
-                                      cgit_query_sha1, cgit_query_path,
-                                      ofs - cnt, cgit_query_grep,
-                                      cgit_query_search);
+                        cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
+                                      ctx.qry.sha1, ctx.qry.path,
+                                      ofs - cnt, ctx.qry.grep,
+                                      ctx.qry.search);
                         html("&nbsp;");
                 }
                 if ((commit = get_revision(&rev)) != NULL) {
-                        cgit_log_link("[next]", NULL, NULL, cgit_query_head,
-                                      cgit_query_sha1, cgit_query_path,
-                                      ofs + cnt, cgit_query_grep,
-                                      cgit_query_search);
+                        cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
+                                      ctx.qry.sha1, ctx.qry.path,
+                                      ofs + cnt, ctx.qry.grep,
+                                      ctx.qry.search);
                 }
                 html("</div>");
         }
 }