-rw-r--r-- | ui-commit.c | 8 | ||||
-rw-r--r-- | ui-summary.c | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/ui-commit.c b/ui-commit.c index 20a7cb2..b6a106f 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -1,27 +1,27 @@ | |||
1 | /* ui-commit.c: generate commit view | 1 | /* ui-commit.c: generate commit view |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | int files = 0, slots = 0; | 11 | static int files, slots; |
12 | int total_adds = 0, total_rems = 0, max_changes = 0; | 12 | static int total_adds, total_rems, max_changes; |
13 | int lines_added, lines_removed; | 13 | static int lines_added, lines_removed; |
14 | 14 | ||
15 | struct fileinfo { | 15 | static struct fileinfo { |
16 | char status; | 16 | char status; |
17 | unsigned char old_sha1[20]; | 17 | unsigned char old_sha1[20]; |
18 | unsigned char new_sha1[20]; | 18 | unsigned char new_sha1[20]; |
19 | unsigned short old_mode; | 19 | unsigned short old_mode; |
20 | unsigned short new_mode; | 20 | unsigned short new_mode; |
21 | char *old_path; | 21 | char *old_path; |
22 | char *new_path; | 22 | char *new_path; |
23 | unsigned int added; | 23 | unsigned int added; |
24 | unsigned int removed; | 24 | unsigned int removed; |
25 | } *items; | 25 | } *items; |
26 | 26 | ||
27 | 27 | ||
diff --git a/ui-summary.c b/ui-summary.c index 9388f5f..f6120f9 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -1,47 +1,47 @@ | |||
1 | /* ui-summary.c: functions for generating repo summary page | 1 | /* ui-summary.c: functions for generating repo summary page |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | int items = 0; | 11 | static int items; |
12 | 12 | ||
13 | static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, | 13 | static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, |
14 | int flags, void *cb_data) | 14 | int flags, void *cb_data) |
15 | { | 15 | { |
16 | struct commit *commit; | 16 | struct commit *commit; |
17 | struct commitinfo *info; | 17 | struct commitinfo *info; |
18 | char buf[256], *url; | 18 | char buf[256], *url; |
19 | 19 | ||
20 | strncpy(buf, refname, sizeof(buf)); | 20 | strncpy(buf, refname, sizeof(buf)); |
21 | commit = lookup_commit(sha1); | 21 | commit = lookup_commit(sha1); |
22 | if (commit && !parse_commit(commit)){ | 22 | if (commit && !parse_commit(commit)){ |
23 | info = cgit_parse_commit(commit); | 23 | info = cgit_parse_commit(commit); |
24 | html("<tr><td>"); | 24 | html("<tr><td>"); |
25 | url = cgit_pageurl(cgit_query_repo, "log", | 25 | url = cgit_pageurl(cgit_query_repo, "log", |
26 | fmt("h=%s", refname)); | 26 | fmt("h=%s", refname)); |
27 | html_link_open(url, NULL, NULL); | 27 | html_link_open(url, NULL, NULL); |
28 | html_txt(buf); | 28 | html_txt(buf); |
29 | html_link_close(); | 29 | html_link_close(); |
30 | html("</td><td>"); | 30 | html("</td><td>"); |
31 | cgit_print_date(commit->date); | 31 | cgit_print_date(commit->date); |
32 | html("</td><td>"); | 32 | html("</td><td>"); |
33 | html_txt(info->author); | 33 | html_txt(info->author); |
34 | html("</td><td>"); | 34 | html("</td><td>"); |
35 | url = cgit_pageurl(cgit_query_repo, "commit", | 35 | url = cgit_pageurl(cgit_query_repo, "commit", |
36 | fmt("id=%s", sha1_to_hex(sha1))); | 36 | fmt("id=%s", sha1_to_hex(sha1))); |
37 | html_link_open(url, NULL, NULL); | 37 | html_link_open(url, NULL, NULL); |
38 | html_ntxt(cgit_max_msg_len, info->subject); | 38 | html_ntxt(cgit_max_msg_len, info->subject); |
39 | html_link_close(); | 39 | html_link_close(); |
40 | html("</td></tr>\n"); | 40 | html("</td></tr>\n"); |
41 | cgit_free_commitinfo(info); | 41 | cgit_free_commitinfo(info); |
42 | } else { | 42 | } else { |
43 | html("<tr><td>"); | 43 | html("<tr><td>"); |
44 | html_txt(buf); | 44 | html_txt(buf); |
45 | html("</td><td colspan='3'>"); | 45 | html("</td><td colspan='3'>"); |
46 | htmlf("*** bad ref %s ***", sha1_to_hex(sha1)); | 46 | htmlf("*** bad ref %s ***", sha1_to_hex(sha1)); |
47 | html("</td></tr>\n"); | 47 | html("</td></tr>\n"); |
@@ -52,57 +52,57 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, | |||
52 | 52 | ||
53 | static void cgit_print_object_ref(struct object *obj) | 53 | static void cgit_print_object_ref(struct object *obj) |
54 | { | 54 | { |
55 | char *page, *url; | 55 | char *page, *url; |
56 | 56 | ||
57 | if (obj->type == OBJ_COMMIT) | 57 | if (obj->type == OBJ_COMMIT) |
58 | page = "commit"; | 58 | page = "commit"; |
59 | else if (obj->type == OBJ_TREE) | 59 | else if (obj->type == OBJ_TREE) |
60 | page = "tree"; | 60 | page = "tree"; |
61 | else | 61 | else |
62 | page = "view"; | 62 | page = "view"; |
63 | 63 | ||
64 | url = cgit_pageurl(cgit_query_repo, page, | 64 | url = cgit_pageurl(cgit_query_repo, page, |
65 | fmt("id=%s", sha1_to_hex(obj->sha1))); | 65 | fmt("id=%s", sha1_to_hex(obj->sha1))); |
66 | html_link_open(url, NULL, NULL); | 66 | html_link_open(url, NULL, NULL); |
67 | htmlf("%s %s", typename(obj->type), | 67 | htmlf("%s %s", typename(obj->type), |
68 | sha1_to_hex(obj->sha1)); | 68 | sha1_to_hex(obj->sha1)); |
69 | html_link_close(); | 69 | html_link_close(); |
70 | } | 70 | } |
71 | 71 | ||
72 | static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1, | 72 | static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1, |
73 | int flags, void *cb_data) | 73 | int flags, void *cb_data) |
74 | { | 74 | { |
75 | struct tag *tag; | 75 | struct tag *tag; |
76 | struct taginfo *info; | 76 | struct taginfo *info; |
77 | struct object *obj; | 77 | struct object *obj; |
78 | char buf[256], *url; | 78 | char buf[256], *url; |
79 | 79 | ||
80 | strncpy(buf, refname, sizeof(buf)); | 80 | strncpy(buf, refname, sizeof(buf)); |
81 | obj = parse_object(sha1); | 81 | obj = parse_object(sha1); |
82 | if (!obj) | 82 | if (!obj) |
83 | return 1; | 83 | return 1; |
84 | if (obj->type == OBJ_TAG) { | 84 | if (obj->type == OBJ_TAG) { |
85 | tag = lookup_tag(sha1); | 85 | tag = lookup_tag(sha1); |
86 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) | 86 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) |
87 | return 2; | 87 | return 2; |
88 | if (!items) { | 88 | if (!items) { |
89 | html("<tr class='nohover'><th class='left'>Tag</th>" | 89 | html("<tr class='nohover'><th class='left'>Tag</th>" |
90 | "<th class='left'>Created</th>" | 90 | "<th class='left'>Created</th>" |
91 | "<th class='left'>Author</th>" | 91 | "<th class='left'>Author</th>" |
92 | "<th class='left'>Reference</th></tr>\n"); | 92 | "<th class='left'>Reference</th></tr>\n"); |
93 | } | 93 | } |
94 | items++; | 94 | items++; |
95 | html("<tr><td>"); | 95 | html("<tr><td>"); |
96 | url = cgit_pageurl(cgit_query_repo, "view", | 96 | url = cgit_pageurl(cgit_query_repo, "view", |
97 | fmt("id=%s", sha1_to_hex(sha1))); | 97 | fmt("id=%s", sha1_to_hex(sha1))); |
98 | html_link_open(url, NULL, NULL); | 98 | html_link_open(url, NULL, NULL); |
99 | html_txt(buf); | 99 | html_txt(buf); |
100 | html_link_close(); | 100 | html_link_close(); |
101 | html("</td><td>"); | 101 | html("</td><td>"); |
102 | if (info->tagger_date > 0) | 102 | if (info->tagger_date > 0) |
103 | cgit_print_date(info->tagger_date); | 103 | cgit_print_date(info->tagger_date); |
104 | html("</td><td>"); | 104 | html("</td><td>"); |
105 | if (info->tagger) | 105 | if (info->tagger) |
106 | html(info->tagger); | 106 | html(info->tagger); |
107 | html("</td><td>"); | 107 | html("</td><td>"); |
108 | cgit_print_object_ref(tag->tagged); | 108 | cgit_print_object_ref(tag->tagged); |