Remove unnecessary parens on return.
This is a mechanical change generated from the following command:
find crypto/{asn1,pem,x509,x509v3} -name '*.c' -o -name '*.h' | xargs sed -i -e 's/return (\([^;()]*\));/return \1;/'
Change-Id: I957295af96c4aa08d6006e27093fd3a07fb6fe75
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/53089
Reviewed-by: Bob Beck <bbe@google.com>
Commit-Queue: Bob Beck <bbe@google.com>
diff --git a/crypto/asn1/a_bitstr.c b/crypto/asn1/a_bitstr.c
index 8ef0d12..9c50857 100644
--- a/crypto/asn1/a_bitstr.c
+++ b/crypto/asn1/a_bitstr.c
@@ -128,7 +128,7 @@
}
p += len;
*pp = p;
- return (ret);
+ return ret;
}
ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
@@ -150,7 +150,7 @@
if ((a == NULL) || ((*a) == NULL)) {
if ((ret = ASN1_BIT_STRING_new()) == NULL) {
- return (NULL);
+ return NULL;
}
} else {
ret = (*a);
@@ -195,12 +195,12 @@
(*a) = ret;
}
*pp = p;
- return (ret);
+ return ret;
err:
if ((ret != NULL) && ((a == NULL) || (*a != ret))) {
ASN1_BIT_STRING_free(ret);
}
- return (NULL);
+ return NULL;
}
// These next 2 functions from Goetz Babin-Ebell <babinebell@trustcenter.de>
@@ -223,7 +223,7 @@
if ((a->length < (w + 1)) || (a->data == NULL)) {
if (!value) {
- return (1); // Don't need to set
+ return 1; // Don't need to set
}
if (a->data == NULL) {
c = (unsigned char *)OPENSSL_malloc(w + 1);
@@ -244,7 +244,7 @@
while ((a->length > 0) && (a->data[a->length - 1] == 0)) {
a->length--;
}
- return (1);
+ return 1;
}
int ASN1_BIT_STRING_get_bit(const ASN1_BIT_STRING *a, int n) {
@@ -253,7 +253,7 @@
w = n / 8;
v = 1 << (7 - (n & 0x07));
if ((a == NULL) || (a->length < (w + 1)) || (a->data == NULL)) {
- return (0);
+ return 0;
}
return ((a->data[w] & v) != 0);
}
diff --git a/crypto/asn1/a_bool.c b/crypto/asn1/a_bool.c
index e4703c6..2a4448c 100644
--- a/crypto/asn1/a_bool.c
+++ b/crypto/asn1/a_bool.c
@@ -65,7 +65,7 @@
r = ASN1_object_size(0, 1, V_ASN1_BOOLEAN);
if (pp == NULL) {
- return (r);
+ return r;
}
if (*pp == NULL) {
diff --git a/crypto/asn1/a_dup.c b/crypto/asn1/a_dup.c
index 402584c..8ee0c7e 100644
--- a/crypto/asn1/a_dup.c
+++ b/crypto/asn1/a_dup.c
@@ -70,16 +70,16 @@
void *ret;
if (x == NULL) {
- return (NULL);
+ return NULL;
}
i = ASN1_item_i2d(x, &b, it);
if (b == NULL) {
OPENSSL_PUT_ERROR(ASN1, ERR_R_MALLOC_FAILURE);
- return (NULL);
+ return NULL;
}
p = b;
ret = ASN1_item_d2i(NULL, &p, i, it);
OPENSSL_free(b);
- return (ret);
+ return ret;
}
diff --git a/crypto/asn1/a_gentm.c b/crypto/asn1/a_gentm.c
index 00a1282..e31ac1d 100644
--- a/crypto/asn1/a_gentm.c
+++ b/crypto/asn1/a_gentm.c
@@ -93,9 +93,9 @@
}
s->type = V_ASN1_GENERALIZEDTIME;
}
- return (1);
+ return 1;
} else {
- return (0);
+ return 0;
}
}
diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c
index a13576a..316210e 100644
--- a/crypto/asn1/a_int.c
+++ b/crypto/asn1/a_int.c
@@ -426,7 +426,7 @@
} else if (ai->type & V_ASN1_NEG) {
BN_set_negative(ret, 1);
}
- return (ret);
+ return ret;
}
BIGNUM *ASN1_INTEGER_to_BN(const ASN1_INTEGER *ai, BIGNUM *bn) {
diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c
index 186ee67..17783ba 100644
--- a/crypto/asn1/a_object.c
+++ b/crypto/asn1/a_object.c
@@ -191,7 +191,7 @@
if ((a == NULL) || ((*a) == NULL) ||
!((*a)->flags & ASN1_OBJECT_FLAG_DYNAMIC)) {
if ((ret = ASN1_OBJECT_new()) == NULL) {
- return (NULL);
+ return NULL;
}
} else {
ret = (*a);
@@ -232,13 +232,13 @@
(*a) = ret;
}
*pp = p;
- return (ret);
+ return ret;
err:
OPENSSL_PUT_ERROR(ASN1, i);
if ((ret != NULL) && ((a == NULL) || (*a != ret))) {
ASN1_OBJECT_free(ret);
}
- return (NULL);
+ return NULL;
}
ASN1_OBJECT *ASN1_OBJECT_new(void) {
@@ -247,7 +247,7 @@
ret = (ASN1_OBJECT *)OPENSSL_malloc(sizeof(ASN1_OBJECT));
if (ret == NULL) {
OPENSSL_PUT_ERROR(ASN1, ERR_R_MALLOC_FAILURE);
- return (NULL);
+ return NULL;
}
ret->length = 0;
ret->data = NULL;
@@ -255,7 +255,7 @@
ret->sn = NULL;
ret->ln = NULL;
ret->flags = ASN1_OBJECT_FLAG_DYNAMIC;
- return (ret);
+ return ret;
}
void ASN1_OBJECT_free(ASN1_OBJECT *a) {
diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c
index 3906bc9..1bb574b 100644
--- a/crypto/asn1/a_strex.c
+++ b/crypto/asn1/a_strex.c
@@ -434,7 +434,7 @@
const char *p;
if (v == NULL) {
- return (0);
+ return 0;
}
n = 0;
p = (const char *)v->data;
@@ -447,17 +447,17 @@
n++;
if (n >= 80) {
if (BIO_write(bp, buf, n) <= 0) {
- return (0);
+ return 0;
}
n = 0;
}
}
if (n > 0) {
if (BIO_write(bp, buf, n) <= 0) {
- return (0);
+ return 0;
}
}
- return (1);
+ return 1;
}
int ASN1_TIME_print(BIO *bp, const ASN1_TIME *tm) {
@@ -468,7 +468,7 @@
return ASN1_GENERALIZEDTIME_print(bp, tm);
}
BIO_write(bp, "Bad time value", 14);
- return (0);
+ return 0;
}
static const char *const mon[12] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
@@ -521,13 +521,13 @@
if (BIO_printf(bp, "%s %2d %02d:%02d:%02d%.*s %d%s", mon[M - 1], d, h, m, s,
f_len, f, y, (gmt) ? " GMT" : "") <= 0) {
- return (0);
+ return 0;
} else {
- return (1);
+ return 1;
}
err:
BIO_write(bp, "Bad time value", 14);
- return (0);
+ return 0;
}
// consume_two_digits is a helper function for ASN1_UTCTIME_print. If |*v|,
diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c
index c0cc2f9..159a0ea 100644
--- a/crypto/asn1/a_utctm.c
+++ b/crypto/asn1/a_utctm.c
@@ -93,9 +93,9 @@
}
s->type = V_ASN1_UTCTIME;
}
- return (1);
+ return 1;
} else {
- return (0);
+ return 0;
}
}
@@ -152,7 +152,7 @@
ts->tm_sec);
s->length = strlen(p);
s->type = V_ASN1_UTCTIME;
- return (s);
+ return s;
err:
if (free_s && s) {
ASN1_UTCTIME_free(s);
diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c
index 6fbeb56..98061db 100644
--- a/crypto/asn1/asn1_lib.c
+++ b/crypto/asn1/asn1_lib.c
@@ -277,7 +277,7 @@
if (len < 0) {
if (data == NULL) {
- return (0);
+ return 0;
} else {
len = strlen(data);
}
@@ -293,7 +293,7 @@
if (str->data == NULL) {
OPENSSL_PUT_ERROR(ASN1, ERR_R_MALLOC_FAILURE);
str->data = c;
- return (0);
+ return 0;
}
}
str->length = len;
@@ -302,7 +302,7 @@
// an allowance for strings :-)
str->data[len] = '\0';
}
- return (1);
+ return 1;
}
void ASN1_STRING_set0(ASN1_STRING *str, void *data, int len) {
@@ -321,13 +321,13 @@
ret = (ASN1_STRING *)OPENSSL_malloc(sizeof(ASN1_STRING));
if (ret == NULL) {
OPENSSL_PUT_ERROR(ASN1, ERR_R_MALLOC_FAILURE);
- return (NULL);
+ return NULL;
}
ret->length = 0;
ret->type = type;
ret->data = NULL;
ret->flags = 0;
- return (ret);
+ return ret;
}
void ASN1_STRING_free(ASN1_STRING *str) {
diff --git a/crypto/asn1/f_int.c b/crypto/asn1/f_int.c
index 84bf667..047fcac 100644
--- a/crypto/asn1/f_int.c
+++ b/crypto/asn1/f_int.c
@@ -64,7 +64,7 @@
char buf[2];
if (a == NULL) {
- return (0);
+ return 0;
}
if (a->type & V_ASN1_NEG) {
@@ -95,9 +95,9 @@
n += 2;
}
}
- return (n);
+ return n;
err:
- return (-1);
+ return -1;
}
int i2a_ASN1_ENUMERATED(BIO *bp, const ASN1_ENUMERATED *a) {
diff --git a/crypto/asn1/f_string.c b/crypto/asn1/f_string.c
index d0fca61..4bc8110 100644
--- a/crypto/asn1/f_string.c
+++ b/crypto/asn1/f_string.c
@@ -64,7 +64,7 @@
char buf[2];
if (a == NULL) {
- return (0);
+ return 0;
}
if (a->length == 0) {
@@ -88,7 +88,7 @@
n += 2;
}
}
- return (n);
+ return n;
err:
- return (-1);
+ return -1;
}
