projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove parentheses of return.
[openssl.git]
/
crypto
/
x509
/
x509name.c
diff --git
a/crypto/x509/x509name.c
b/crypto/x509/x509name.c
index eb912396ead7d6b12254ee279b3bbe5a36a997bd..bde5db4066128e78671c9fbb8ed99a8131a1208c 100644
(file)
--- a/
crypto/x509/x509name.c
+++ b/
crypto/x509/x509name.c
@@
-22,8
+22,8
@@
int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf, int len)
obj = OBJ_nid2obj(nid);
if (obj == NULL)
obj = OBJ_nid2obj(nid);
if (obj == NULL)
- return
(-1)
;
- return
(X509_NAME_get_text_by_OBJ(name, obj, buf, len)
);
+ return
-1
;
+ return
X509_NAME_get_text_by_OBJ(name, obj, buf, len
);
}
int X509_NAME_get_text_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, char *buf,
}
int X509_NAME_get_text_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, char *buf,
@@
-34,21
+34,21
@@
int X509_NAME_get_text_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, char *buf
i = X509_NAME_get_index_by_OBJ(name, obj, -1);
if (i < 0)
i = X509_NAME_get_index_by_OBJ(name, obj, -1);
if (i < 0)
- return
(-1)
;
+ return
-1
;
data = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(name, i));
i = (data->length > (len - 1)) ? (len - 1) : data->length;
if (buf == NULL)
data = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(name, i));
i = (data->length > (len - 1)) ? (len - 1) : data->length;
if (buf == NULL)
- return
(data->length)
;
+ return
data->length
;
memcpy(buf, data->data, i);
buf[i] = '\0';
memcpy(buf, data->data, i);
buf[i] = '\0';
- return
(i)
;
+ return
i
;
}
int X509_NAME_entry_count(const X509_NAME *name)
{
if (name == NULL)
}
int X509_NAME_entry_count(const X509_NAME *name)
{
if (name == NULL)
- return
(0)
;
- return
(sk_X509_NAME_ENTRY_num(name->entries)
);
+ return
0
;
+ return
sk_X509_NAME_ENTRY_num(name->entries
);
}
int X509_NAME_get_index_by_NID(X509_NAME *name, int nid, int lastpos)
}
int X509_NAME_get_index_by_NID(X509_NAME *name, int nid, int lastpos)
@@
-57,8
+57,8
@@
int X509_NAME_get_index_by_NID(X509_NAME *name, int nid, int lastpos)
obj = OBJ_nid2obj(nid);
if (obj == NULL)
obj = OBJ_nid2obj(nid);
if (obj == NULL)
- return
(-2)
;
- return
(X509_NAME_get_index_by_OBJ(name, obj, lastpos)
);
+ return
-2
;
+ return
X509_NAME_get_index_by_OBJ(name, obj, lastpos
);
}
/* NOTE: you should be passing -1, not 0 as lastpos */
}
/* NOTE: you should be passing -1, not 0 as lastpos */
@@
-69,7
+69,7
@@
int X509_NAME_get_index_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int last
STACK_OF(X509_NAME_ENTRY) *sk;
if (name == NULL)
STACK_OF(X509_NAME_ENTRY) *sk;
if (name == NULL)
- return
(-1)
;
+ return
-1
;
if (lastpos < 0)
lastpos = -1;
sk = name->entries;
if (lastpos < 0)
lastpos = -1;
sk = name->entries;
@@
-77,9
+77,9
@@
int X509_NAME_get_index_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int last
for (lastpos++; lastpos < n; lastpos++) {
ne = sk_X509_NAME_ENTRY_value(sk, lastpos);
if (OBJ_cmp(ne->object, obj) == 0)
for (lastpos++; lastpos < n; lastpos++) {
ne = sk_X509_NAME_ENTRY_value(sk, lastpos);
if (OBJ_cmp(ne->object, obj) == 0)
- return
(lastpos)
;
+ return
lastpos
;
}
}
- return
(-1)
;
+ return
-1
;
}
X509_NAME_ENTRY *X509_NAME_get_entry(const X509_NAME *name, int loc)
}
X509_NAME_ENTRY *X509_NAME_get_entry(const X509_NAME *name, int loc)
@@
-186,7
+186,7
@@
int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne, int loc,
STACK_OF(X509_NAME_ENTRY) *sk;
if (name == NULL)
STACK_OF(X509_NAME_ENTRY) *sk;
if (name == NULL)
- return
(0)
;
+ return
0
;
sk = name->entries;
n = sk_X509_NAME_ENTRY_num(sk);
if (loc > n)
sk = name->entries;
n = sk_X509_NAME_ENTRY_num(sk);
if (loc > n)
@@
-235,7
+235,7
@@
int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne, int loc,
return 1;
err:
X509_NAME_ENTRY_free(new_name);
return 1;
err:
X509_NAME_ENTRY_free(new_name);
- return
(0)
;
+ return
0
;
}
X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
}
X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
@@
-251,7
+251,7
@@
X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
X509err(X509_F_X509_NAME_ENTRY_CREATE_BY_TXT,
X509_R_INVALID_FIELD_NAME);
ERR_add_error_data(2, "name=", field);
X509err(X509_F_X509_NAME_ENTRY_CREATE_BY_TXT,
X509_R_INVALID_FIELD_NAME);
ERR_add_error_data(2, "name=", field);
- return
(NULL)
;
+ return
NULL
;
}
nentry = X509_NAME_ENTRY_create_by_OBJ(ne, obj, type, bytes, len);
ASN1_OBJECT_free(obj);
}
nentry = X509_NAME_ENTRY_create_by_OBJ(ne, obj, type, bytes, len);
ASN1_OBJECT_free(obj);
@@
-269,7
+269,7
@@
X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid,
obj = OBJ_nid2obj(nid);
if (obj == NULL) {
X509err(X509_F_X509_NAME_ENTRY_CREATE_BY_NID, X509_R_UNKNOWN_NID);
obj = OBJ_nid2obj(nid);
if (obj == NULL) {
X509err(X509_F_X509_NAME_ENTRY_CREATE_BY_NID, X509_R_UNKNOWN_NID);
- return
(NULL)
;
+ return
NULL
;
}
nentry = X509_NAME_ENTRY_create_by_OBJ(ne, obj, type, bytes, len);
ASN1_OBJECT_free(obj);
}
nentry = X509_NAME_ENTRY_create_by_OBJ(ne, obj, type, bytes, len);
ASN1_OBJECT_free(obj);
@@
-285,7
+285,7
@@
X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne,
if ((ne == NULL) || (*ne == NULL)) {
if ((ret = X509_NAME_ENTRY_new()) == NULL)
if ((ne == NULL) || (*ne == NULL)) {
if ((ret = X509_NAME_ENTRY_new()) == NULL)
- return
(NULL)
;
+ return
NULL
;
} else
ret = *ne;
} else
ret = *ne;
@@
-296,11
+296,11
@@
X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne,
if ((ne != NULL) && (*ne == NULL))
*ne = ret;
if ((ne != NULL) && (*ne == NULL))
*ne = ret;
- return
(ret)
;
+ return
ret
;
err:
if ((ne == NULL) || (ret != *ne))
X509_NAME_ENTRY_free(ret);
err:
if ((ne == NULL) || (ret != *ne))
X509_NAME_ENTRY_free(ret);
- return
(NULL)
;
+ return
NULL
;
}
int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, const ASN1_OBJECT *obj)
}
int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, const ASN1_OBJECT *obj)
@@
-308,7
+308,7
@@
int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, const ASN1_OBJECT *obj)
if ((ne == NULL) || (obj == NULL)) {
X509err(X509_F_X509_NAME_ENTRY_SET_OBJECT,
ERR_R_PASSED_NULL_PARAMETER);
if ((ne == NULL) || (obj == NULL)) {
X509err(X509_F_X509_NAME_ENTRY_SET_OBJECT,
ERR_R_PASSED_NULL_PARAMETER);
- return
(0)
;
+ return
0
;
}
ASN1_OBJECT_free(ne->object);
ne->object = OBJ_dup(obj);
}
ASN1_OBJECT_free(ne->object);
ne->object = OBJ_dup(obj);
@@
-321,7
+321,7
@@
int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
int i;
if ((ne == NULL) || ((bytes == NULL) && (len != 0)))
int i;
if ((ne == NULL) || ((bytes == NULL) && (len != 0)))
- return
(0)
;
+ return
0
;
if ((type > 0) && (type & MBSTRING_FLAG))
return ASN1_STRING_set_by_NID(&ne->value, bytes,
len, type,
if ((type > 0) && (type & MBSTRING_FLAG))
return ASN1_STRING_set_by_NID(&ne->value, bytes,
len, type,
@@
-330,7
+330,7
@@
int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
len = strlen((const char *)bytes);
i = ASN1_STRING_set(ne->value, bytes, len);
if (!i)
len = strlen((const char *)bytes);
i = ASN1_STRING_set(ne->value, bytes, len);
if (!i)
- return
(0)
;
+ return
0
;
if (type != V_ASN1_UNDEF) {
if (type == V_ASN1_APP_CHOOSE)
ne->value->type = ASN1_PRINTABLE_type(bytes, len);
if (type != V_ASN1_UNDEF) {
if (type == V_ASN1_APP_CHOOSE)
ne->value->type = ASN1_PRINTABLE_type(bytes, len);
@@
-343,15
+343,15
@@
int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
ASN1_OBJECT *X509_NAME_ENTRY_get_object(const X509_NAME_ENTRY *ne)
{
if (ne == NULL)
ASN1_OBJECT *X509_NAME_ENTRY_get_object(const X509_NAME_ENTRY *ne)
{
if (ne == NULL)
- return
(NULL)
;
- return
(ne->object)
;
+ return
NULL
;
+ return
ne->object
;
}
ASN1_STRING *X509_NAME_ENTRY_get_data(const X509_NAME_ENTRY *ne)
{
if (ne == NULL)
}
ASN1_STRING *X509_NAME_ENTRY_get_data(const X509_NAME_ENTRY *ne)
{
if (ne == NULL)
- return
(NULL)
;
- return
(ne->value)
;
+ return
NULL
;
+ return
ne->value
;
}
int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne)
}
int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne)