Since return is inconsistent, I removed unnecessary parentheses and

[openssl.git] / crypto / pkcs7 / pk7_lib.c

diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index 69c68cf5f3d5b451740450d741c3f7adfccb7e9d..1ab53b8a647cb594fe00cb3f4f3a03d439f5f307 100644 (file)
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -71,7 +71,7 @@ int PKCS7_content_new(PKCS7 *p7, int type)
     if (!PKCS7_set_content(p7, ret))
         goto err;
 
     if (!PKCS7_set_content(p7, ret))
         goto err;
 

-    return (1);
+    return 1;

  err:
     PKCS7_free(ret);
     return (0);
  err:
     PKCS7_free(ret);
     return (0);


@@ -99,7 +99,7 @@ int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data)
         PKCS7err(PKCS7_F_PKCS7_SET_CONTENT, PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
         goto err;
     }
         PKCS7err(PKCS7_F_PKCS7_SET_CONTENT, PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
         goto err;
     }

-    return (1);
+    return 1;

  err:
     return (0);
 }
  err:
     return (0);
 }


@@ -171,7 +171,7 @@ int PKCS7_set_type(PKCS7 *p7, int type)
         PKCS7err(PKCS7_F_PKCS7_SET_TYPE, PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
         goto err;
     }
         PKCS7err(PKCS7_F_PKCS7_SET_TYPE, PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
         goto err;
     }

-    return (1);
+    return 1;

  err:
     return (0);
 }
  err:
     return (0);
 }


@@ -233,7 +233,7 @@ int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi)
 
     if (!sk_PKCS7_SIGNER_INFO_push(signer_sk, psi))
         return 0;
 
     if (!sk_PKCS7_SIGNER_INFO_push(signer_sk, psi))
         return 0;

-    return (1);
+    return 1;

 }
 
 int PKCS7_add_certificate(PKCS7 *p7, X509 *x509)
 }
 
 int PKCS7_add_certificate(PKCS7 *p7, X509 *x509)


@@ -265,7 +265,7 @@ int PKCS7_add_certificate(PKCS7 *p7, X509 *x509)
         X509_free(x509);
         return 0;
     }
         X509_free(x509);
         return 0;
     }

-    return (1);
+    return 1;

 }
 
 int PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl)
 }
 
 int PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl)


@@ -298,7 +298,7 @@ int PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl)
         X509_CRL_free(crl);
         return 0;
     }
         X509_CRL_free(crl);
         return 0;
     }

-    return (1);
+    return 1;

 }
 
 int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
 }
 
 int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,


@@ -457,7 +457,7 @@ int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri)
 
     if (!sk_PKCS7_RECIP_INFO_push(sk, ri))
         return 0;
 
     if (!sk_PKCS7_RECIP_INFO_push(sk, ri))
         return 0;

-    return (1);
+    return 1;

 }
 
 int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)
 }
 
 int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)