mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 16:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Lars Hjemli 2012-03-18 10:10:10 +00:00
commit 961893b547
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-shared.c
View File

@ -294,7 +294,7 @@ void cgit_log_link(const char *name, const char *title, const char *class,
char *delim; char *delim;
delim = repolink(title, class, "log", head, path); delim = repolink(title, class, "log", head, path);
if (rev && strcmp(rev, ctx.qry.head)) { if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) {
html(delim); html(delim);
html("id="); html("id=");
html_url_arg(rev); html_url_arg(rev);
@ -338,7 +338,7 @@ void cgit_commit_link(char *name, const char *title, const char *class,
char *delim; char *delim;
delim = repolink(title, class, "commit", head, path); delim = repolink(title, class, "commit", head, path);
if (rev && strcmp(rev, ctx.qry.head)) { if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) {
html(delim); html(delim);
html("id="); html("id=");
html_url_arg(rev); html_url_arg(rev);

8
ui-ssdiff.c
View File

@ -23,7 +23,7 @@ static void create_or_reset_lcs_table()
int i; int i;
if (L != NULL) { if (L != NULL) {
memset(*L, 0, sizeof(*L) * MAX_SSDIFF_SIZE); memset(*L, 0, sizeof(int) * MAX_SSDIFF_SIZE);
return; return;
} }
@ -42,14 +42,12 @@ static char *longest_common_subsequence(char *A, char *B)
int i, j, ri; int i, j, ri;
int m = strlen(A); int m = strlen(A);
int n = strlen(B); int n = strlen(B);
int tmp1, tmp2, length; int tmp1, tmp2;
int lcs_length; int lcs_length;
char *result; char *result;
length = (m + 1) * (n + 1);
// We bail if the lines are too long // We bail if the lines are too long
if (length > MAX_SSDIFF_SIZE) if (m >= MAX_SSDIFF_M || n >= MAX_SSDIFF_N)
return NULL; return NULL;
create_or_reset_lcs_table(); create_or_reset_lcs_table();