generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use p==NULL not !p (in if statements, mainly)

Browse Source 
Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Rich Salz
2015-05-06 13:43:59 -04:00
committed by Rich Salz
parent 344c271eb3
commit 75ebbd9aa4
118 changed files with 754 additions and 724 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
engines/e_ubsec.c
View File

@@ -414,38 +414,26 @@ static int ubsec_init(ENGINE *e)
goto err;
}
if (!(p1 = (t_UBSEC_ubsec_bytes_to_bits *)
DSO_bind_func(ubsec_dso, UBSEC_F1))
|| !(p2 = (t_UBSEC_ubsec_bits_to_bytes *)
DSO_bind_func(ubsec_dso, UBSEC_F2))
|| !(p3 = (t_UBSEC_ubsec_open *)
DSO_bind_func(ubsec_dso, UBSEC_F3))
|| !(p4 = (t_UBSEC_ubsec_close *)
DSO_bind_func(ubsec_dso, UBSEC_F4))
#define BINDIT(t, name) (t *)DSO_bind_func(ubsec_dso, name)
if ((p1 = BINDIT(t_UBSEC_ubsec_bytes_to_bits, UBSEC_F1)) == NULL
|| (p2 = BINDIT(t_UBSEC_ubsec_bits_to_bytes, UBSEC_F2)) == NULL
|| (p3 = BINDIT(t_UBSEC_ubsec_open, UBSEC_F3)) == NULL
|| (p4 = BINDIT(t_UBSEC_ubsec_close, UBSEC_F4)) == NULL
# ifndef OPENSSL_NO_DH
|| !(p5 = (t_UBSEC_diffie_hellman_generate_ioctl *)
DSO_bind_func(ubsec_dso, UBSEC_F5))
|| !(p6 = (t_UBSEC_diffie_hellman_agree_ioctl *)
DSO_bind_func(ubsec_dso, UBSEC_F6))
|| (p5 = BINDIT(t_UBSEC_diffie_hellman_generate_ioctl, UBSEC_F5)) == NULL
|| (p6 = BINDIT(t_UBSEC_diffie_hellman_agree_ioctl, UBSEC_F6)) == NULL
# endif
/* #ifndef OPENSSL_NO_RSA */
|| !(p7 = (t_UBSEC_rsa_mod_exp_ioctl *)
DSO_bind_func(ubsec_dso, UBSEC_F7))
|| !(p8 = (t_UBSEC_rsa_mod_exp_crt_ioctl *)
DSO_bind_func(ubsec_dso, UBSEC_F8))
|| (p7 = BINDIT(t_UBSEC_rsa_mod_exp_ioctl, UBSEC_F7)) == NULL
|| (p8 = BINDIT(t_UBSEC_rsa_mod_exp_crt_ioctl, UBSEC_F8)) == NULL
/* #endif */
# ifndef OPENSSL_NO_DSA
|| !(p9 = (t_UBSEC_dsa_sign_ioctl *)
DSO_bind_func(ubsec_dso, UBSEC_F9))
|| !(p10 = (t_UBSEC_dsa_verify_ioctl *)
DSO_bind_func(ubsec_dso, UBSEC_F10))
|| (p9 = BINDIT(t_UBSEC_dsa_sign_ioctl, UBSEC_F9)) == NULL
|| (p10 = BINDIT(t_UBSEC_dsa_verify_ioctl, UBSEC_F10)) == NULL
# endif
|| !(p11 = (t_UBSEC_math_accelerate_ioctl *)
DSO_bind_func(ubsec_dso, UBSEC_F11))
|| !(p12 = (t_UBSEC_rng_ioctl *)
DSO_bind_func(ubsec_dso, UBSEC_F12))
|| !(p13 = (t_UBSEC_max_key_len_ioctl *)
DSO_bind_func(ubsec_dso, UBSEC_F13))) {
|| (p11 = BINDIT(t_UBSEC_math_accelerate_ioctl, UBSEC_F11)) == NULL
|| (p12 = BINDIT(t_UBSEC_rng_ioctl, UBSEC_F12)) == NULL
|| (p13 = BINDIT(t_UBSEC_max_key_len_ioctl, UBSEC_F13)) == NULL) {
UBSECerr(UBSEC_F_UBSEC_INIT, UBSEC_R_DSO_FAILURE);
goto err;
}