ui-diff: close td/tr/table properly

[ps-cgit] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index 3ed0a465b378e877c21bb21856cac94d827a6c74..5c864d926777670de0ddf449c96b0e016c294b4c 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -38,7 +38,6 @@ static void header(unsigned char *sha1, char *path1, int mode1,
        int subproject;
 
        subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2));
        int subproject;
 
        subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2));

-       html("<tr><td>");

        html("<div class='head'>");
        html("diff --git a/");
        html_txt(path1);
        html("<div class='head'>");
        html("diff --git a/");
        html_txt(path1);


@@ -97,14 +96,18 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex,
        unsigned long size;
        struct commit *commit;
 
        unsigned long size;
        struct commit *commit;
 

+       html("<table class='diff'>");
+       html("<tr><td>");
+

        if (head && !old_hex && !new_hex) {
                get_sha1(head, sha1);
                commit = lookup_commit_reference(sha1);
        if (head && !old_hex && !new_hex) {
                get_sha1(head, sha1);
                commit = lookup_commit_reference(sha1);

-               if (commit && !parse_commit(commit)) {
-                       html("<table class='diff'>");
+               if (commit && !parse_commit(commit))

                        cgit_diff_commit(commit, filepair_cb);
                        cgit_diff_commit(commit, filepair_cb);

-                       html("</td></tr></table>");
-               }
+               else
+                       cgit_print_error(fmt("Bad commit: %s", head));
+               html("</td></tr>");
+               html("</table>");

                return;
        }
 
                return;
        }
 


@@ -120,14 +123,11 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex,
                }
        }
 
                }
        }
 

-       html("<table class='diff'>");

        switch(type) {
        case OBJ_BLOB:
        switch(type) {
        case OBJ_BLOB:

-               html("<tr><td>");

                header(sha1, path, 0644, sha2, path, 0644);
                if (cgit_diff_files(sha1, sha2, print_line))
                        cgit_print_error("Error running diff");
                header(sha1, path, 0644, sha2, path, 0644);
                if (cgit_diff_files(sha1, sha2, print_line))
                        cgit_print_error("Error running diff");

-               html("</tr></td>");

                break;
        case OBJ_TREE:
                cgit_diff_tree(sha1, sha2, filepair_cb);
                break;
        case OBJ_TREE:
                cgit_diff_tree(sha1, sha2, filepair_cb);


@@ -137,5 +137,6 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex,
                                     typename(type)));
                break;
        }
                                     typename(type)));
                break;
        }

-       html("</td></tr></table>");
+       html("</td></tr>");
+       html("</table>");

 }
 }