From 53e56df7411dd5f7d9b0da5ed2af7a32b3a2405a Mon Sep 17 00:00:00 2001 From: tb Date: Tue, 14 May 2024 07:35:23 +0000 Subject: [PATCH] x509_ext.c: remove lots of extraneous parentheses No change in the generated assembly --- lib/libcrypto/x509/x509_ext.c | 46 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/libcrypto/x509/x509_ext.c b/lib/libcrypto/x509/x509_ext.c index ce316d25bd5..6faafc4bf0e 100644 --- a/lib/libcrypto/x509/x509_ext.c +++ b/lib/libcrypto/x509/x509_ext.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_ext.c,v 1.16 2023/02/16 08:38:17 tb Exp $ */ +/* $OpenBSD: x509_ext.c,v 1.17 2024/05/14 07:35:23 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -70,42 +70,42 @@ int X509_CRL_get_ext_count(const X509_CRL *x) { - return (X509v3_get_ext_count(x->crl->extensions)); + return X509v3_get_ext_count(x->crl->extensions); } LCRYPTO_ALIAS(X509_CRL_get_ext_count); int X509_CRL_get_ext_by_NID(const X509_CRL *x, int nid, int lastpos) { - return (X509v3_get_ext_by_NID(x->crl->extensions, nid, lastpos)); + return X509v3_get_ext_by_NID(x->crl->extensions, nid, lastpos); } LCRYPTO_ALIAS(X509_CRL_get_ext_by_NID); int X509_CRL_get_ext_by_OBJ(const X509_CRL *x, const ASN1_OBJECT *obj, int lastpos) { - return (X509v3_get_ext_by_OBJ(x->crl->extensions, obj, lastpos)); + return X509v3_get_ext_by_OBJ(x->crl->extensions, obj, lastpos); } LCRYPTO_ALIAS(X509_CRL_get_ext_by_OBJ); int X509_CRL_get_ext_by_critical(const X509_CRL *x, int crit, int lastpos) { - return (X509v3_get_ext_by_critical(x->crl->extensions, crit, lastpos)); + return X509v3_get_ext_by_critical(x->crl->extensions, crit, lastpos); } LCRYPTO_ALIAS(X509_CRL_get_ext_by_critical); X509_EXTENSION * X509_CRL_get_ext(const X509_CRL *x, int loc) { - return (X509v3_get_ext(x->crl->extensions, loc)); + return X509v3_get_ext(x->crl->extensions, loc); } LCRYPTO_ALIAS(X509_CRL_get_ext); X509_EXTENSION * X509_CRL_delete_ext(X509_CRL *x, int loc) { - return (X509v3_delete_ext(x->crl->extensions, loc)); + return X509v3_delete_ext(x->crl->extensions, loc); } LCRYPTO_ALIAS(X509_CRL_delete_ext); @@ -127,57 +127,57 @@ LCRYPTO_ALIAS(X509_CRL_add1_ext_i2d); int X509_CRL_add_ext(X509_CRL *x, X509_EXTENSION *ex, int loc) { - return (X509v3_add_ext(&(x->crl->extensions), ex, loc) != NULL); + return X509v3_add_ext(&x->crl->extensions, ex, loc) != NULL; } LCRYPTO_ALIAS(X509_CRL_add_ext); int X509_get_ext_count(const X509 *x) { - return (X509v3_get_ext_count(x->cert_info->extensions)); + return X509v3_get_ext_count(x->cert_info->extensions); } LCRYPTO_ALIAS(X509_get_ext_count); int X509_get_ext_by_NID(const X509 *x, int nid, int lastpos) { - return (X509v3_get_ext_by_NID(x->cert_info->extensions, nid, lastpos)); + return X509v3_get_ext_by_NID(x->cert_info->extensions, nid, lastpos); } LCRYPTO_ALIAS(X509_get_ext_by_NID); int X509_get_ext_by_OBJ(const X509 *x, const ASN1_OBJECT *obj, int lastpos) { - return (X509v3_get_ext_by_OBJ(x->cert_info->extensions, obj, lastpos)); + return X509v3_get_ext_by_OBJ(x->cert_info->extensions, obj, lastpos); } LCRYPTO_ALIAS(X509_get_ext_by_OBJ); int X509_get_ext_by_critical(const X509 *x, int crit, int lastpos) { - return (X509v3_get_ext_by_critical(x->cert_info->extensions, crit, - lastpos)); + return X509v3_get_ext_by_critical(x->cert_info->extensions, crit, + lastpos); } LCRYPTO_ALIAS(X509_get_ext_by_critical); X509_EXTENSION * X509_get_ext(const X509 *x, int loc) { - return (X509v3_get_ext(x->cert_info->extensions, loc)); + return X509v3_get_ext(x->cert_info->extensions, loc); } LCRYPTO_ALIAS(X509_get_ext); X509_EXTENSION * X509_delete_ext(X509 *x, int loc) { - return (X509v3_delete_ext(x->cert_info->extensions, loc)); + return X509v3_delete_ext(x->cert_info->extensions, loc); } LCRYPTO_ALIAS(X509_delete_ext); int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc) { - return (X509v3_add_ext(&(x->cert_info->extensions), ex, loc) != NULL); + return X509v3_add_ext(&x->cert_info->extensions, ex, loc) != NULL; } LCRYPTO_ALIAS(X509_add_ext); @@ -199,14 +199,14 @@ LCRYPTO_ALIAS(X509_add1_ext_i2d); int X509_REVOKED_get_ext_count(const X509_REVOKED *x) { - return (X509v3_get_ext_count(x->extensions)); + return X509v3_get_ext_count(x->extensions); } LCRYPTO_ALIAS(X509_REVOKED_get_ext_count); int X509_REVOKED_get_ext_by_NID(const X509_REVOKED *x, int nid, int lastpos) { - return (X509v3_get_ext_by_NID(x->extensions, nid, lastpos)); + return X509v3_get_ext_by_NID(x->extensions, nid, lastpos); } LCRYPTO_ALIAS(X509_REVOKED_get_ext_by_NID); @@ -214,35 +214,35 @@ int X509_REVOKED_get_ext_by_OBJ(const X509_REVOKED *x, const ASN1_OBJECT *obj, int lastpos) { - return (X509v3_get_ext_by_OBJ(x->extensions, obj, lastpos)); + return X509v3_get_ext_by_OBJ(x->extensions, obj, lastpos); } LCRYPTO_ALIAS(X509_REVOKED_get_ext_by_OBJ); int X509_REVOKED_get_ext_by_critical(const X509_REVOKED *x, int crit, int lastpos) { - return (X509v3_get_ext_by_critical(x->extensions, crit, lastpos)); + return X509v3_get_ext_by_critical(x->extensions, crit, lastpos); } LCRYPTO_ALIAS(X509_REVOKED_get_ext_by_critical); X509_EXTENSION * X509_REVOKED_get_ext(const X509_REVOKED *x, int loc) { - return (X509v3_get_ext(x->extensions, loc)); + return X509v3_get_ext(x->extensions, loc); } LCRYPTO_ALIAS(X509_REVOKED_get_ext); X509_EXTENSION * X509_REVOKED_delete_ext(X509_REVOKED *x, int loc) { - return (X509v3_delete_ext(x->extensions, loc)); + return X509v3_delete_ext(x->extensions, loc); } LCRYPTO_ALIAS(X509_REVOKED_delete_ext); int X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc) { - return (X509v3_add_ext(&(x->extensions), ex, loc) != NULL); + return X509v3_add_ext(&x->extensions, ex, loc) != NULL; } LCRYPTO_ALIAS(X509_REVOKED_add_ext); -- 2.20.1