X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/1d4aaff696ee1b9085dda0f0f3d84d9d20d96db0..0835ffefb8a1f5387463b22e2e5f7e34d387d7b1:/shared.c diff --git a/shared.c b/shared.c index 077934f..343a4f9 100644 --- a/shared.c +++ b/shared.c @@ -23,7 +23,7 @@ char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; char *cgit_agefile = "info/web/last-modified"; char *cgit_virtual_root = NULL; char *cgit_script_name = CGIT_SCRIPT_NAME; -char *cgit_cache_root = "/var/cache/cgit"; +char *cgit_cache_root = CGIT_CACHE_ROOT; char *cgit_repo_group = NULL; int cgit_nocache = 0; @@ -308,7 +308,8 @@ static int load_mmfile(mmfile_t *file, const unsigned char *sha1) file->ptr = (char *)""; file->size = 0; } else { - file->ptr = read_sha1_file(sha1, &type, &file->size); + file->ptr = read_sha1_file(sha1, &type, + (unsigned long *)&file->size); } return 1; } @@ -373,6 +374,7 @@ int cgit_diff_files(const unsigned char *old_sha1, diff_params.flags = XDF_NEED_MINIMAL; emit_params.ctxlen = 3; emit_params.flags = XDL_EMIT_FUNCNAMES; + emit_params.find_func = NULL; emit_cb.outf = filediff_cb; emit_cb.priv = fn; xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);