-rw-r--r-- | cgit.h | 2 | ||||
-rw-r--r-- | shared.c | 10 | ||||
-rw-r--r-- | ui-commit.c | 5 | ||||
-rw-r--r-- | ui-log.c | 5 | ||||
-rw-r--r-- | ui-summary.c | 1 |
5 files changed, 15 insertions, 8 deletions
@@ -60,16 +60,18 @@ extern char *cgit_query_sha1; | |||
60 | extern int cgit_query_ofs; | 60 | extern int cgit_query_ofs; |
61 | 61 | ||
62 | extern int htmlfd; | 62 | extern int htmlfd; |
63 | 63 | ||
64 | extern void cgit_global_config_cb(const char *name, const char *value); | 64 | extern void cgit_global_config_cb(const char *name, const char *value); |
65 | extern void cgit_repo_config_cb(const char *name, const char *value); | 65 | extern void cgit_repo_config_cb(const char *name, const char *value); |
66 | extern void cgit_querystring_cb(const char *name, const char *value); | 66 | extern void cgit_querystring_cb(const char *name, const char *value); |
67 | 67 | ||
68 | extern void *cgit_free_commitinfo(struct commitinfo *info); | ||
69 | |||
68 | extern char *fmt(const char *format,...); | 70 | extern char *fmt(const char *format,...); |
69 | 71 | ||
70 | extern void html(const char *txt); | 72 | extern void html(const char *txt); |
71 | extern void htmlf(const char *format,...); | 73 | extern void htmlf(const char *format,...); |
72 | extern void html_txt(char *txt); | 74 | extern void html_txt(char *txt); |
73 | extern void html_attr(char *txt); | 75 | extern void html_attr(char *txt); |
74 | extern void html_link_open(char *url, char *title, char *class); | 76 | extern void html_link_open(char *url, char *title, char *class); |
75 | extern void html_link_close(void); | 77 | extern void html_link_close(void); |
@@ -83,8 +83,18 @@ void cgit_querystring_cb(const char *name, const char *value) | |||
83 | } else if (!strcmp(name, "id")) { | 83 | } else if (!strcmp(name, "id")) { |
84 | cgit_query_sha1 = xstrdup(value); | 84 | cgit_query_sha1 = xstrdup(value); |
85 | cgit_query_has_sha1 = 1; | 85 | cgit_query_has_sha1 = 1; |
86 | } else if (!strcmp(name, "ofs")) { | 86 | } else if (!strcmp(name, "ofs")) { |
87 | cgit_query_ofs = atoi(value); | 87 | cgit_query_ofs = atoi(value); |
88 | } | 88 | } |
89 | } | 89 | } |
90 | 90 | ||
91 | void *cgit_free_commitinfo(struct commitinfo *info) | ||
92 | { | ||
93 | free(info->author); | ||
94 | free(info->author_email); | ||
95 | free(info->committer); | ||
96 | free(info->committer_email); | ||
97 | free(info->subject); | ||
98 | free(info); | ||
99 | return NULL; | ||
100 | } | ||
diff --git a/ui-commit.c b/ui-commit.c index b441e14..f654208 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -56,13 +56,10 @@ void cgit_print_commit(const char *hex) | |||
56 | } | 56 | } |
57 | html("</table>\n"); | 57 | html("</table>\n"); |
58 | html("<div class='commit-subject'>"); | 58 | html("<div class='commit-subject'>"); |
59 | html_txt(info->subject); | 59 | html_txt(info->subject); |
60 | html("</div>"); | 60 | html("</div>"); |
61 | html("<div class='commit-msg'>"); | 61 | html("<div class='commit-msg'>"); |
62 | html_txt(info->msg); | 62 | html_txt(info->msg); |
63 | html("</div>"); | 63 | html("</div>"); |
64 | free(info->author); | 64 | cgit_free_commitinfo(info); |
65 | free(info->committer); | ||
66 | free(info->subject); | ||
67 | free(info); | ||
68 | } | 65 | } |
@@ -23,20 +23,17 @@ void print_commit(struct commit *commit) | |||
23 | char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1)); | 23 | char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
24 | char *url = cgit_pageurl(cgit_query_repo, "commit", qry); | 24 | char *url = cgit_pageurl(cgit_query_repo, "commit", qry); |
25 | html_link_open(url, NULL, NULL); | 25 | html_link_open(url, NULL, NULL); |
26 | html_txt(info->subject); | 26 | html_txt(info->subject); |
27 | html_link_close(); | 27 | html_link_close(); |
28 | html("</td><td>"); | 28 | html("</td><td>"); |
29 | html_txt(info->author); | 29 | html_txt(info->author); |
30 | html("</td></tr>\n"); | 30 | html("</td></tr>\n"); |
31 | free(info->author); | 31 | cgit_free_commitinfo(info); |
32 | free(info->committer); | ||
33 | free(info->subject); | ||
34 | free(info); | ||
35 | } | 32 | } |
36 | 33 | ||
37 | 34 | ||
38 | void cgit_print_log(const char *tip, int ofs, int cnt) | 35 | void cgit_print_log(const char *tip, int ofs, int cnt) |
39 | { | 36 | { |
40 | struct rev_info rev; | 37 | struct rev_info rev; |
41 | struct commit *commit; | 38 | struct commit *commit; |
42 | const char *argv[2] = {NULL, tip}; | 39 | const char *argv[2] = {NULL, tip}; |
diff --git a/ui-summary.c b/ui-summary.c index 8ff3642..5ddeee3 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -30,16 +30,17 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, | |||
30 | html("</td><td>"); | 30 | html("</td><td>"); |
31 | url = cgit_pageurl(cgit_query_repo, "commit", fmt("id=%s", sha1_to_hex(sha1))); | 31 | url = cgit_pageurl(cgit_query_repo, "commit", fmt("id=%s", sha1_to_hex(sha1))); |
32 | html_link_open(url, NULL, NULL); | 32 | html_link_open(url, NULL, NULL); |
33 | html_txt(info->subject); | 33 | html_txt(info->subject); |
34 | html_link_close(); | 34 | html_link_close(); |
35 | html("</td><td>"); | 35 | html("</td><td>"); |
36 | html_txt(info->author); | 36 | html_txt(info->author); |
37 | html("</td></tr>\n"); | 37 | html("</td></tr>\n"); |
38 | cgit_free_commitinfo(info); | ||
38 | } else { | 39 | } else { |
39 | html("<tr><td>"); | 40 | html("<tr><td>"); |
40 | html_txt(buf); | 41 | html_txt(buf); |
41 | html("</td><td>"); | 42 | html("</td><td>"); |
42 | htmlf("*** bad ref %s", sha1_to_hex(sha1)); | 43 | htmlf("*** bad ref %s", sha1_to_hex(sha1)); |
43 | html("</td></tr>\n"); | 44 | html("</td></tr>\n"); |
44 | } | 45 | } |
45 | return 0; | 46 | return 0; |