Fixes a number of warnings of the type
libavutil/hmac.c:61:21: warning: assignment from incompatible pointer type
---
libavutil/hmac.c | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/libavutil/hmac.c b/libavutil/hmac.c
index 378be62..62516be 100644
--- a/libavutil/hmac.c
+++ b/libavutil/hmac.c
@@ -29,12 +29,16 @@
#define MAX_HASHLEN 32
#define MAX_BLOCKLEN 64
+typedef void (*hmac_final)(void *, uint8_t *);
+typedef void (*hmac_update)(void *, const uint8_t *, int len);
+typedef void (*hmac_init)(void *);
+
struct AVHMAC {
void *hash;
int blocklen, hashlen;
- void (*final)(void*, uint8_t*);
- void (*update)(void*, const uint8_t*, int len);
- void (*init)(void*);
+ hmac_final final;
+ hmac_update update;
+ hmac_init init;
uint8_t key[MAX_BLOCKLEN];
int keylen;
};
@@ -58,33 +62,33 @@ AVHMAC *av_hmac_alloc(enum AVHMACType type)
case AV_HMAC_MD5:
c->blocklen = 64;
c->hashlen = 16;
- c->init = av_md5_init;
- c->update = av_md5_update;
- c->final = av_md5_final;
+ c->init = (hmac_init) av_md5_init;
+ c->update = (hmac_update) av_md5_update;
+ c->final = (hmac_final) av_md5_final;
c->hash = av_md5_alloc();
break;
case AV_HMAC_SHA1:
c->blocklen = 64;
c->hashlen = 20;
c->init = sha160_init;
- c->update = av_sha_update;
- c->final = av_sha_final;
+ c->update = (hmac_update) av_sha_update;
+ c->final = (hmac_final) av_sha_final;
c->hash = av_sha_alloc();
break;
case AV_HMAC_SHA224:
c->blocklen = 64;
c->hashlen = 28;
c->init = sha224_init;
- c->update = av_sha_update;
- c->final = av_sha_final;
+ c->update = (hmac_update) av_sha_update;
+ c->final = (hmac_final) av_sha_final;
c->hash = av_sha_alloc();
break;
case AV_HMAC_SHA256:
c->blocklen = 64;
c->hashlen = 32;
c->init = sha256_init;
- c->update = av_sha_update;
- c->final = av_sha_final;
+ c->update = (hmac_update) av_sha_update;
+ c->final = (hmac_final) av_sha_final;
c->hash = av_sha_alloc();
break;
default:
--
2.1.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
