Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit665a00c

Browse files
committed
Fix error message wording in previous sslinfo commit
1 parent4912461 commit665a00c

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

‎contrib/sslinfo/sslinfo.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ ASN1_STRING_to_text(ASN1_STRING *str)
149149
if (membuf==NULL)
150150
ereport(ERROR,
151151
(errcode(ERRCODE_OUT_OF_MEMORY),
152-
errmsg("failed to create OpenSSL BIO structure")));
152+
errmsg("could not create OpenSSL BIO structure")));
153153
(void)BIO_set_close(membuf,BIO_CLOSE);
154154
ASN1_STRING_print_ex(membuf,str,
155155
((ASN1_STRFLGS_RFC2253& ~ASN1_STRFLGS_ESC_MSB)
@@ -163,7 +163,7 @@ ASN1_STRING_to_text(ASN1_STRING *str)
163163
if (dp!=sp)
164164
pfree(dp);
165165
if (BIO_free(membuf)!=1)
166-
elog(ERROR,"failed to free OpenSSL BIO structure");
166+
elog(ERROR,"could not free OpenSSL BIO structure");
167167

168168
PG_RETURN_TEXT_P(result);
169169
}
@@ -305,7 +305,7 @@ X509_NAME_to_text(X509_NAME *name)
305305
if (membuf==NULL)
306306
ereport(ERROR,
307307
(errcode(ERRCODE_OUT_OF_MEMORY),
308-
errmsg("failed to create BIO")));
308+
errmsg("could not createOpenSSLBIO structure")));
309309

310310
(void)BIO_set_close(membuf,BIO_CLOSE);
311311
for (i=0;i<count;i++)
@@ -315,15 +315,15 @@ X509_NAME_to_text(X509_NAME *name)
315315
if (nid==NID_undef)
316316
ereport(ERROR,
317317
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
318-
errmsg("failed to get NID for ASN1_OBJECT object")));
318+
errmsg("could not get NID for ASN1_OBJECT object")));
319319
v=X509_NAME_ENTRY_get_data(e);
320320
field_name=OBJ_nid2sn(nid);
321321
if (field_name==NULL)
322322
field_name=OBJ_nid2ln(nid);
323323
if (field_name==NULL)
324324
ereport(ERROR,
325325
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
326-
errmsg("failed to convert NID %d to an ASN1_OBJECT structure",nid)));
326+
errmsg("could not convert NID %d to an ASN1_OBJECT structure",nid)));
327327
BIO_printf(membuf,"/%s=",field_name);
328328
ASN1_STRING_print_ex(membuf,v,
329329
((ASN1_STRFLGS_RFC2253& ~ASN1_STRFLGS_ESC_MSB)
@@ -339,7 +339,7 @@ X509_NAME_to_text(X509_NAME *name)
339339
if (dp!=sp)
340340
pfree(dp);
341341
if (BIO_free(membuf)!=1)
342-
elog(ERROR,"failed to free OpenSSL BIO structure");
342+
elog(ERROR,"could not free OpenSSL BIO structure");
343343

344344
PG_RETURN_TEXT_P(result);
345345
}
@@ -523,6 +523,6 @@ ssl_extension_info(PG_FUNCTION_ARGS)
523523
SRF_RETURN_NEXT(funcctx,result);
524524
}
525525

526-
/*Do when there is no more left */
526+
/*All done */
527527
SRF_RETURN_DONE(funcctx);
528528
}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp