postgres.git / summary / log / commit / refs

commit    cedb3e66ae718d097a065ec0d357164332c15d80
Author:   Alvaro Herrera <alvherre@alvh.no-ip.org>
Date:     Tue Sep 08 14:10:20 2015 +0000
First released in: 9.6.0, 9.0.23, 9.1.19, 9.2.14, 9.3.10, 9.4.5, 9.5.0

    Fix error message wording in previous sslinfo commit


 contrib/sslinfo/sslinfo.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/sslinfo/sslinfo.c b/contrib/sslinfo/sslinfo.c
index 12dba79892b..2ac41cfa3da 100644
--- a/contrib/sslinfo/sslinfo.c
+++ b/contrib/sslinfo/sslinfo.c
@@ -152,7 +152,7 @@ ASN1_STRING_to_text(ASN1_STRING *str)
 	if (membuf == NULL)
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
-				 errmsg("failed to create OpenSSL BIO structure")));
+				 errmsg("could not create OpenSSL BIO structure")));
 	(void) BIO_set_close(membuf, BIO_CLOSE);
 	ASN1_STRING_print_ex(membuf, str,
 						 ((ASN1_STRFLGS_RFC2253 & ~ASN1_STRFLGS_ESC_MSB)
@@ -169,7 +169,7 @@ ASN1_STRING_to_text(ASN1_STRING *str)
 	if (dp != sp)
 		pfree(dp);
 	if (BIO_free(membuf) != 1)
-		elog(ERROR, "failed to free OpenSSL BIO structure");
+		elog(ERROR, "could not free OpenSSL BIO structure");
 
 	PG_RETURN_TEXT_P(result);
 }
@@ -311,7 +311,7 @@ X509_NAME_to_text(X509_NAME *name)
 	if (membuf == NULL)
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
-				 errmsg("failed to create BIO")));
+				 errmsg("could not create OpenSSL BIO structure")));
 
 	(void) BIO_set_close(membuf, BIO_CLOSE);
 	for (i = 0; i < count; i++)
@@ -321,7 +321,7 @@ X509_NAME_to_text(X509_NAME *name)
 		if (nid == NID_undef)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("failed to get NID for ASN1_OBJECT object")));
+					 errmsg("could not get NID for ASN1_OBJECT object")));
 		v = X509_NAME_ENTRY_get_data(e);
 		field_name = OBJ_nid2sn(nid);
 		if (field_name == NULL)
@@ -329,7 +329,7 @@ X509_NAME_to_text(X509_NAME *name)
 		if (field_name == NULL)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("failed to convert NID %d to an ASN1_OBJECT structure", nid)));
+					 errmsg("could not convert NID %d to an ASN1_OBJECT structure", nid)));
 		BIO_printf(membuf, "/%s=", field_name);
 		ASN1_STRING_print_ex(membuf, v,
 							 ((ASN1_STRFLGS_RFC2253 & ~ASN1_STRFLGS_ESC_MSB)
@@ -348,7 +348,7 @@ X509_NAME_to_text(X509_NAME *name)
 	if (dp != sp)
 		pfree(dp);
 	if (BIO_free(membuf) != 1)
-		elog(ERROR, "failed to free OpenSSL BIO structure");
+		elog(ERROR, "could not free OpenSSL BIO structure");
 
 	PG_RETURN_TEXT_P(result);
 }


[parent: adc48eaa4411]