From cc21081eac32f2bcce4611014f6ceb5b79770f40 Mon Sep 17 00:00:00 2001 From: tb Date: Sat, 25 Mar 2023 10:45:20 +0000 Subject: [PATCH] Drop unnecessary casts from and to void * --- lib/libcrypto/asn1/bio_asn1.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/libcrypto/asn1/bio_asn1.c b/lib/libcrypto/asn1/bio_asn1.c index 8fb9bc5bf4a..7e25a9c410c 100644 --- a/lib/libcrypto/asn1/bio_asn1.c +++ b/lib/libcrypto/asn1/bio_asn1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_asn1.c,v 1.20 2023/03/25 10:41:52 tb Exp $ */ +/* $OpenBSD: bio_asn1.c,v 1.21 2023/03/25 10:45:20 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -163,7 +163,7 @@ asn1_bio_new(BIO *b) ctx->state = ASN1_STATE_START; b->init = 1; - b->ptr = (char *)ctx; + b->ptr = ctx; b->flags = 0; return 1; @@ -172,9 +172,8 @@ asn1_bio_new(BIO *b) static int asn1_bio_free(BIO *b) { - BIO_ASN1_BUF_CTX *ctx; + BIO_ASN1_BUF_CTX *ctx = b->ptr; - ctx = (BIO_ASN1_BUF_CTX *) b->ptr; if (ctx == NULL) return 0; @@ -200,8 +199,8 @@ asn1_bio_write(BIO *b, const char *in , int inl) if (!in || (inl < 0) || (b->next_bio == NULL)) return 0; - ctx = (BIO_ASN1_BUF_CTX *) b->ptr; - if (ctx == NULL) + + if ((ctx = b->ptr) == NULL) return 0; wrlen = 0; @@ -366,8 +365,7 @@ asn1_bio_ctrl(BIO *b, int cmd, long arg1, void *arg2) BIO_ASN1_EX_FUNCS *ex_func; long ret = 1; - ctx = (BIO_ASN1_BUF_CTX *) b->ptr; - if (ctx == NULL) + if ((ctx = b->ptr) == NULL) return 0; switch (cmd) { -- 2.20.1