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

ui-snapshot: replace 'unsigned char sha1[20]' with 'struct object_id oid'

Browse Source 
Upstream git is replacing 'unsigned char sha1[20]' with 'struct object_id
oid'. We have some code that can be changed independent from upstream. So
here we go...
This commit is contained in:
Christian Hesse 2016-09-29 22:12:11 +02:00
parent 6bef566f99
commit 406f593895
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui-snapshot.c
View File

@ -109,19 +109,19 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
const char *hex, const char *prefix, const char *hex, const char *prefix,
const char *filename) const char *filename)
{ {
unsigned char sha1[20]; struct object_id oid;
if (get_sha1(hex, sha1)) { if (get_oid(hex, &oid)) {
cgit_print_error_page(404, "Not found", cgit_print_error_page(404, "Not found",
"Bad object id: %s", hex); "Bad object id: %s", hex);
return 1; return 1;
} }
if (!lookup_commit_reference(sha1)) { if (!lookup_commit_reference(oid.hash)) {
cgit_print_error_page(400, "Bad request", cgit_print_error_page(400, "Bad request",
"Not a commit reference: %s", hex); "Not a commit reference: %s", hex);
return 1; return 1;
} }
ctx.page.etag = sha1_to_hex(sha1); ctx.page.etag = oid_to_hex(&oid);
ctx.page.mimetype = xstrdup(format->mimetype); ctx.page.mimetype = xstrdup(format->mimetype);
ctx.page.filename = xstrdup(filename); ctx.page.filename = xstrdup(filename);
cgit_print_http_headers(); cgit_print_http_headers();
@ -143,14 +143,14 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
const struct cgit_snapshot_format *format) const struct cgit_snapshot_format *format)
{ {
const char *reponame; const char *reponame;
unsigned char sha1[20]; struct object_id oid;
struct strbuf snapshot = STRBUF_INIT; struct strbuf snapshot = STRBUF_INIT;
int result = 1; int result = 1;
strbuf_addstr(&snapshot, filename); strbuf_addstr(&snapshot, filename);
strbuf_setlen(&snapshot, snapshot.len - strlen(format->suffix)); strbuf_setlen(&snapshot, snapshot.len - strlen(format->suffix));
if (get_sha1(snapshot.buf, sha1) == 0) if (get_oid(snapshot.buf, &oid) == 0)
goto out; goto out;
reponame = cgit_repobasename(url); reponame = cgit_repobasename(url);
@ -162,15 +162,15 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
strbuf_splice(&snapshot, 0, new_start - snapshot.buf, "", 0); strbuf_splice(&snapshot, 0, new_start - snapshot.buf, "", 0);
} }
if (get_sha1(snapshot.buf, sha1) == 0) if (get_oid(snapshot.buf, &oid) == 0)
goto out; goto out;
strbuf_insert(&snapshot, 0, "v", 1); strbuf_insert(&snapshot, 0, "v", 1);
if (get_sha1(snapshot.buf, sha1) == 0) if (get_oid(snapshot.buf, &oid) == 0)
goto out; goto out;
strbuf_splice(&snapshot, 0, 1, "V", 1); strbuf_splice(&snapshot, 0, 1, "V", 1);
if (get_sha1(snapshot.buf, sha1) == 0) if (get_oid(snapshot.buf, &oid) == 0)
goto out; goto out;
result = 0; result = 0;