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) (unidiff) | |
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
@@ -259,9 +259,9 @@ char *xstrdupn(const char *str) | |||
259 | } | 259 | } |
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; |
267 | ctx->cfg.cache_dynamic_ttl = 5; | 267 | ctx->cfg.cache_dynamic_ttl = 5; |
diff --git a/ui-shared.c b/ui-shared.c index 08ea003..8827fff 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -245,9 +245,9 @@ static void reporevlink(char *page, char *name, char *title, char *class, | |||
245 | { | 245 | { |
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); |
253 | } | 253 | } |
@@ -362,9 +362,9 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, | |||
362 | { | 362 | { |
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); |
370 | delim = "&"; | 370 | delim = "&"; |