diff options
| author | Lars Hjemli | 2010-02-27 12:53:27 +0100 |
|---|---|---|
| committer | Lars Hjemli | 2010-02-27 12:53:27 +0100 |
| commit | 71d3ca75d1e941948dd3b965f5a5c2f2865e94fd (patch) | |
| tree | 703e8cfe4bc3715833afa824d2f2bd320eb9a89e | |
| parent | Merge branch 'stable' (diff) | |
| parent | Clear the whole context (diff) | |
| download | cgit-71d3ca75d1e941948dd3b965f5a5c2f2865e94fd.tar.gz cgit-71d3ca75d1e941948dd3b965f5a5c2f2865e94fd.zip | |
Merge branch 'stable'
| -rw-r--r-- | cgit.c | 2 | ||||
| -rw-r--r-- | ui-shared.c | 4 |
2 files changed, 3 insertions, 3 deletions
| diff --git a/cgit.c b/cgit.c index e46c00a..9305d0a 100644 --- a/cgit.c +++ b/cgit.c | |||
| @@ -260,7 +260,7 @@ char *xstrdupn(const char *str) | |||
| 260 | 260 | ||
| 261 | static void prepare_context(struct cgit_context *ctx) | 261 | static void prepare_context(struct cgit_context *ctx) |
| 262 | { | 262 | { |
| 263 | memset(ctx, 0, sizeof(ctx)); | 263 | memset(ctx, 0, sizeof(*ctx)); |
| 264 | ctx->cfg.agefile = "info/web/last-modified"; | 264 | ctx->cfg.agefile = "info/web/last-modified"; |
| 265 | ctx->cfg.nocache = 0; | 265 | ctx->cfg.nocache = 0; |
| 266 | ctx->cfg.cache_size = 0; | 266 | ctx->cfg.cache_size = 0; |
| diff --git a/ui-shared.c b/ui-shared.c index 08ea003..8827fff 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
| @@ -246,7 +246,7 @@ static void reporevlink(char *page, char *name, char *title, char *class, | |||
| 246 | char *delim; | 246 | char *delim; |
| 247 | 247 | ||
| 248 | delim = repolink(title, class, page, head, path); | 248 | delim = repolink(title, class, page, head, path); |
| 249 | if (rev && strcmp(rev, ctx.qry.head)) { | 249 | if (rev && ctx.qry.head != NULL && strcmp(rev, ctx.qry.head)) { |
| 250 | html(delim); | 250 | html(delim); |
| 251 | html("id="); | 251 | html("id="); |
| 252 | html_url_arg(rev); | 252 | html_url_arg(rev); |
| @@ -363,7 +363,7 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, | |||
| 363 | char *delim; | 363 | char *delim; |
| 364 | 364 | ||
| 365 | delim = repolink(title, class, "diff", head, path); | 365 | delim = repolink(title, class, "diff", head, path); |
| 366 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { | 366 | if (new_rev && ctx.qry.head != NULL && strcmp(new_rev, ctx.qry.head)) { |
| 367 | html(delim); | 367 | html(delim); |
| 368 | html("id="); | 368 | html("id="); |
| 369 | html_url_arg(new_rev); | 369 | html_url_arg(new_rev); |