filters: highlight.sh: add css comments for highlight 2.6 and 3.8

[cgit.git] / ui-ssdiff.c

diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 45770b1a547fe773dc959a2acc49eebcef74a7f1..08cf513b477097b85315e448f80401900f50e5d8 100644 (file)
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -1,8 +1,8 @@
 #include "cgit.h"
 #include "cgit.h"

+#include "ui-ssdiff.h"

 #include "html.h"
 #include "ui-shared.h"
 #include "ui-diff.h"
 #include "html.h"
 #include "ui-shared.h"
 #include "ui-diff.h"

-#include "ui-ssdiff.h"

 
 extern int use_ssdiff;
 
 
 extern int use_ssdiff;
 


@@ -23,7 +23,7 @@ static void create_or_reset_lcs_table()
        int i;
 
        if (L != NULL) {
        int i;
 
        if (L != NULL) {

-               memset(*L, 0, sizeof(*L) * MAX_SSDIFF_SIZE);
+               memset(*L, 0, sizeof(int) * MAX_SSDIFF_SIZE);

                return;
        }
 
                return;
        }
 


@@ -138,9 +138,8 @@ static char *replace_tabs(char *line)
                        strcat(result, prev_buf);
                        break;
                } else {
                        strcat(result, prev_buf);
                        break;
                } else {

-                       strcat(result, " ");
-                       strncat(result, spaces, 8 - (strlen(result) % 8));

                        strncat(result, prev_buf, cur_buf - prev_buf);
                        strncat(result, prev_buf, cur_buf - prev_buf);

+                       strncat(result, spaces, 8 - (strlen(result) % 8));

                }
                prev_buf = cur_buf + 1;
        }
                }
                prev_buf = cur_buf + 1;
        }


@@ -230,10 +229,10 @@ static void print_ssdiff_line(char *class,
        if (old_line_no > 0) {
                struct diff_filespec *old_file = cgit_get_current_old_file();
                char *lineno_str = fmt("n%d", old_line_no);
        if (old_line_no > 0) {
                struct diff_filespec *old_file = cgit_get_current_old_file();
                char *lineno_str = fmt("n%d", old_line_no);

-               char *id_str = fmt("%s#%s", is_null_sha1(old_file->sha1)?"HEAD":sha1_to_hex(old_rev_sha1), lineno_str);
-               html("<td class='lineno'><a class='no' href='");
+               char *id_str = fmt("id=%s#%s", is_null_sha1(old_file->sha1)?"HEAD":sha1_to_hex(old_rev_sha1), lineno_str);
+               html("<td class='lineno'><a href='");

                html(cgit_fileurl(ctx.repo->url, "tree", old_file->path, id_str));
                html(cgit_fileurl(ctx.repo->url, "tree", old_file->path, id_str));

-               htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1);
+               htmlf("' id='%s'>%s</a>", lineno_str, lineno_str + 1);

                html("</td>");
                htmlf("<td class='%s'>", class);
        } else if (old_line)
                html("</td>");
                htmlf("<td class='%s'>", class);
        } else if (old_line)


@@ -251,10 +250,10 @@ static void print_ssdiff_line(char *class,
        if (new_line_no > 0) {
                struct diff_filespec *new_file = cgit_get_current_new_file();
                char *lineno_str = fmt("n%d", new_line_no);
        if (new_line_no > 0) {
                struct diff_filespec *new_file = cgit_get_current_new_file();
                char *lineno_str = fmt("n%d", new_line_no);

-               char *id_str = fmt("%s#%s", is_null_sha1(new_file->sha1)?"HEAD":sha1_to_hex(new_rev_sha1), lineno_str);
-               html("<td class='lineno'><a class='no' href='");
+               char *id_str = fmt("id=%s#%s", is_null_sha1(new_file->sha1)?"HEAD":sha1_to_hex(new_rev_sha1), lineno_str);
+               html("<td class='lineno'><a href='");

                html(cgit_fileurl(ctx.repo->url, "tree", new_file->path, id_str));
                html(cgit_fileurl(ctx.repo->url, "tree", new_file->path, id_str));

-               htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1);
+               htmlf("' id='%s'>%s</a>", lineno_str, lineno_str + 1);

                html("</td>");
                htmlf("<td class='%s'>", class);
        } else if (new_line)
                html("</td>");
                htmlf("<td class='%s'>", class);
        } else if (new_line)