Fix error message wording in previous sslinfo commit
authorAlvaro Herrera <alvherre@alvh.no-ip.org>
Tue, 8 Sep 2015 14:10:20 +0000 (11:10 -0300)
committerAlvaro Herrera <alvherre@alvh.no-ip.org>
Tue, 8 Sep 2015 14:10:20 +0000 (11:10 -0300)
contrib/sslinfo/sslinfo.c

index e00f8a2663c22be0c701d32391be2fea1194acec..237af6cfd282a6d9ea74191d34607af35281a604 100644 (file)
@@ -149,7 +149,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)
@@ -163,7 +163,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);
 }
@@ -305,7 +305,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++)
@@ -315,7 +315,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)
@@ -323,7 +323,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)
@@ -339,7 +339,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);
 }
@@ -523,6 +523,6 @@ ssl_extension_info(PG_FUNCTION_ARGS)
        SRF_RETURN_NEXT(funcctx, result);
    }
 
-   /* Do when there is no more left */
+   /* All done */
    SRF_RETURN_DONE(funcctx);
 }