diff options
author | Christian Hesse | 2020-10-20 23:46:09 +0200 |
---|---|---|
committer | Christian Hesse | 2020-10-20 23:57:12 +0200 |
commit | a4de0e810b69710c3b32f6d253d80d16dec09f36 (patch) | |
tree | bae0b334de05e134d06b48aeb888a3bf134a705a /parsing.c | |
parent | 779631c6dc23c15bbbf45a7c7ab9fffb619037b7 (diff) | |
download | cgit-a4de0e810b69710c3b32f6d253d80d16dec09f36.tar.gz cgit-a4de0e810b69710c3b32f6d253d80d16dec09f36.tar.bz2 cgit-a4de0e810b69710c3b32f6d253d80d16dec09f36.zip |
global: replace hard coded hash length
With sha1 we had a guaranteed length of 40 hex chars. This changes now
that we have to support sha256 with 64 hex chars... Support both.
Signed-off-by: Christian Hesse <mail@eworm.de>
Diffstat (limited to 'parsing.c')
-rw-r--r-- | parsing.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -127,7 +127,6 @@ static int end_of_header(const char *p) | |||
127 | 127 | ||
128 | struct commitinfo *cgit_parse_commit(struct commit *commit) | 128 | struct commitinfo *cgit_parse_commit(struct commit *commit) |
129 | { | 129 | { |
130 | const int oid_hex_len = 40; | ||
131 | struct commitinfo *ret; | 130 | struct commitinfo *ret; |
132 | const char *p = repo_get_commit_buffer(the_repository, commit, NULL); | 131 | const char *p = repo_get_commit_buffer(the_repository, commit, NULL); |
133 | const char *t; | 132 | const char *t; |
@@ -140,10 +139,10 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) | |||
140 | 139 | ||
141 | if (!skip_prefix(p, "tree ", &p)) | 140 | if (!skip_prefix(p, "tree ", &p)) |
142 | die("Bad commit: %s", oid_to_hex(&commit->object.oid)); | 141 | die("Bad commit: %s", oid_to_hex(&commit->object.oid)); |
143 | p += oid_hex_len + 1; | 142 | p += the_hash_algo->hexsz + 1; |
144 | 143 | ||
145 | while (skip_prefix(p, "parent ", &p)) | 144 | while (skip_prefix(p, "parent ", &p)) |
146 | p += oid_hex_len + 1; | 145 | p += the_hash_algo->hexsz + 1; |
147 | 146 | ||
148 | if (p && skip_prefix(p, "author ", &p)) { | 147 | if (p && skip_prefix(p, "author ", &p)) { |
149 | parse_user(p, &ret->author, &ret->author_email, | 148 | parse_user(p, &ret->author, &ret->author_email, |