diff options
author | Carlo Marcelo Arenas Belón <carenas@gmail.com> | 2020-05-05 02:53:26 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-05-05 11:26:25 -0700 |
commit | 3013118eb86f1c9e3d9b669bc23e770ee6e04174 (patch) | |
tree | 36d3484a52766ea9a9657219f3f3585fbf19af79 /t/t0007-git-var.sh | |
parent | Git 2.24.3 (diff) | |
download | tgif-3013118eb86f1c9e3d9b669bc23e770ee6e04174.tar.xz |
builtin/receive-pack: avoid generic function name hmac()
fabec2c5c3 (builtin/receive-pack: switch to use the_hash_algo, 2019-08-18)
renames hmac_sha1 to hmac, as it was updated to use the hash function used
by git (which won't be sha1 in the future).
hmac() is provided by NetBSD >= 8 libc and therefore conflicts as shown by :
builtin/receive-pack.c:421:13: error: conflicting types for 'hmac'
static void hmac(unsigned char *out,
^~~~
In file included from ./git-compat-util.h:172:0,
from ./builtin.h:4,
from builtin/receive-pack.c:1:
/usr/include/stdlib.h:305:10: note: previous declaration of 'hmac' was here
ssize_t hmac(const char *, const void *, size_t, const void *, size_t, void *,
^~~~
Rename it again to hmac_hash to reflect it will use the git's defined hash
function and avoid the conflict, while at it update a comment to better
describe the HMAC function that was used.
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t0007-git-var.sh')
0 files changed, 0 insertions, 0 deletions