| author | Lars Hjemli <hjemli@gmail.com> | 2010-02-27 11:53:27 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2010-02-27 11:53:27 (UTC) |
| commit | 71d3ca75d1e941948dd3b965f5a5c2f2865e94fd (patch) (side-by-side diff) | |
| tree | 703e8cfe4bc3715833afa824d2f2bd320eb9a89e | |
| parent | 547a64fbd65de293c290f4e18bbeae958d54aaa7 (diff) | |
| parent | 9bd3a7b1ea6c5863d7cba1b5352ce707f5d129a0 (diff) | |
| download | cgit-71d3ca75d1e941948dd3b965f5a5c2f2865e94fd.zip cgit-71d3ca75d1e941948dd3b965f5a5c2f2865e94fd.tar.gz cgit-71d3ca75d1e941948dd3b965f5a5c2f2865e94fd.tar.bz2 | |
Merge branch 'stable'
| -rw-r--r-- | cgit.c | 2 | ||||
| -rw-r--r-- | ui-shared.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -261,5 +261,5 @@ char *xstrdupn(const char *str) static void prepare_context(struct cgit_context *ctx) { - memset(ctx, 0, sizeof(ctx)); + memset(ctx, 0, sizeof(*ctx)); ctx->cfg.agefile = "info/web/last-modified"; ctx->cfg.nocache = 0; diff --git a/ui-shared.c b/ui-shared.c index 08ea003..8827fff 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -247,5 +247,5 @@ static void reporevlink(char *page, char *name, char *title, char *class, delim = repolink(title, class, page, head, path); - if (rev && strcmp(rev, ctx.qry.head)) { + if (rev && ctx.qry.head != NULL && strcmp(rev, ctx.qry.head)) { html(delim); html("id="); @@ -364,5 +364,5 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, delim = repolink(title, class, "diff", head, path); - if (new_rev && strcmp(new_rev, ctx.qry.head)) { + if (new_rev && ctx.qry.head != NULL && strcmp(new_rev, ctx.qry.head)) { html(delim); html("id="); |