🌐 AI搜索 & 代理 主页
Skip to content

Commit 45c8ed9

Browse files
bmomjianbmomjian
committed
Make some sentences consistent with similar ones.
Euler Taveira de Oliveira
1 parent 9e23cd6 commit 45c8ed9

File tree

9 files changed

+22
-22
lines changed

9 files changed

+22
-22
lines changed

‎src/backend/access/transam/twophase.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.22 2006/07/30 02:07:18 alvherre Exp $
10+
* $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.23 2006/10/03 21:21:35 momjian Exp $
1111
*
1212
* NOTES
1313
* Each global transaction is associated with a global transaction
@@ -1250,7 +1250,7 @@ RemoveTwoPhaseFile(TransactionId xid, bool giveWarning)
12501250
if (errno != ENOENT || giveWarning)
12511251
ereport(WARNING,
12521252
(errcode_for_file_access(),
1253-
errmsg("could not remove two-phase state file \"%s\": %m",
1253+
errmsg("could not remove twophase state file \"%s\": %m",
12541254
path)));
12551255
}
12561256

‎src/backend/commands/aggregatecmds.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $PostgreSQL: pgsql/src/backend/commands/aggregatecmds.c,v 1.39 2006/09/25 15:17:34 tgl Exp $
12+
* $PostgreSQL: pgsql/src/backend/commands/aggregatecmds.c,v 1.40 2006/10/03 21:21:36 momjian Exp $
1313
*
1414
* DESCRIPTION
1515
* The "DefineFoo" routines take the parse tree and pick out the
@@ -219,7 +219,7 @@ RemoveAggregate(RemoveFuncStmt *stmt)
219219
{
220220
/* we only get here if stmt->missing_ok is true */
221221
ereport(NOTICE,
222-
(errmsg("aggregate %s(%s) does not exist ... skipping",
222+
(errmsg("aggregate %s(%s) does not exist, skipping",
223223
NameListToString(aggName),
224224
TypeNameListToString(aggArgs))));
225225
return;

‎src/backend/commands/functioncmds.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.77 2006/09/25 15:17:34 tgl Exp $
13+
* $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.78 2006/10/03 21:21:36 momjian Exp $
1414
*
1515
* DESCRIPTION
1616
* These routines take the parse tree and pick out the
@@ -690,7 +690,7 @@ RemoveFunction(RemoveFuncStmt *stmt)
690690
{
691691
/* can only get here if stmt->missing_ok */
692692
ereport(NOTICE,
693-
(errmsg("function %s(%s) does not exist ... skipping",
693+
(errmsg("function %s(%s) does not exist, skipping",
694694
NameListToString(functionName),
695695
TypeNameListToString(argTypes))));
696696
return;

‎src/backend/commands/operatorcmds.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $PostgreSQL: pgsql/src/backend/commands/operatorcmds.c,v 1.31 2006/06/16 20:23:44 adunstan Exp $
12+
* $PostgreSQL: pgsql/src/backend/commands/operatorcmds.c,v 1.32 2006/10/03 21:21:36 momjian Exp $
1313
*
1414
* DESCRIPTION
1515
* The "DefineFoo" routines take the parse tree and pick out the
@@ -218,7 +218,7 @@ RemoveOperator(RemoveFuncStmt *stmt)
218218
if (stmt->missing_ok &&!OidIsValid(operOid) )
219219
{
220220
ereport(NOTICE,
221-
(errmsg("operator %s does not exist ... skipping",
221+
(errmsg("operator %s does not exist, skipping",
222222
NameListToString(operatorName))));
223223
return;
224224
}

‎src/backend/commands/proclang.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/commands/proclang.c,v 1.67 2006/07/14 14:52:18 momjian Exp $
10+
* $PostgreSQL: pgsql/src/backend/commands/proclang.c,v 1.68 2006/10/03 21:21:36 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -401,7 +401,7 @@ DropProceduralLanguage(DropPLangStmt *stmt)
401401
errmsg("language \"%s\" does not exist", languageName)));
402402
else
403403
ereport(NOTICE,
404-
(errmsg("language \"%s\" does not exist ... skipping",
404+
(errmsg("language \"%s\" does not exist, skipping",
405405
languageName)));
406406

407407
return;

‎src/backend/commands/tablespace.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
*
3939
* IDENTIFICATION
40-
* $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.37 2006/07/14 14:52:18 momjian Exp $
40+
* $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.38 2006/10/03 21:21:36 momjian Exp $
4141
*
4242
*-------------------------------------------------------------------------
4343
*/
@@ -412,7 +412,7 @@ DropTableSpace(DropTableSpaceStmt *stmt)
412412
else
413413
{
414414
ereport(NOTICE,
415-
(errmsg("tablespace \"%s\" does not exist ... skipping",
415+
(errmsg("tablespace \"%s\" does not exist, skipping",
416416
tablespacename)));
417417
/* XXX I assume I need one or both of these next two calls */
418418
heap_endscan(scandesc);

‎src/backend/commands/trigger.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.207 2006/09/04 21:15:56 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.208 2006/10/03 21:21:36 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -487,7 +487,7 @@ DropTrigger(Oid relid, const char *trigname, DropBehavior behavior,
487487
trigname, get_rel_name(relid))));
488488
else
489489
ereport(NOTICE,
490-
(errmsg("trigger \"%s\" for table \"%s\" does not exist ...skipping",
490+
(errmsg("trigger \"%s\" for table \"%s\" does not exist, skipping",
491491
trigname, get_rel_name(relid))));
492492
/* cleanup */
493493
systable_endscan(tgscan);

‎src/backend/libpq/auth.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.142 2006/09/15 21:28:08 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.143 2006/10/03 21:21:36 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -784,11 +784,11 @@ CheckLDAPAuth(Port *port)
784784
{
785785
#ifndef WIN32
786786
ereport(LOG,
787-
(errmsg("could not initialize LDAP: error %d",
787+
(errmsg("could not initialize LDAP: error code %d",
788788
errno)));
789789
#else
790790
ereport(LOG,
791-
(errmsg("could not initialize LDAP: error %d",
791+
(errmsg("could not initialize LDAP: error code %d",
792792
(int) LdapGetLastError())));
793793
#endif
794794
return STATUS_ERROR;
@@ -797,7 +797,7 @@ CheckLDAPAuth(Port *port)
797797
if ((r = ldap_set_option(ldap, LDAP_OPT_PROTOCOL_VERSION, &ldapversion)) != LDAP_SUCCESS)
798798
{
799799
ereport(LOG,
800-
(errmsg("could not set LDAP protocol version: error %d", r)));
800+
(errmsg("could not set LDAP protocol version: error code %d", r)));
801801
return STATUS_ERROR;
802802
}
803803

@@ -843,7 +843,7 @@ CheckLDAPAuth(Port *port)
843843
#endif
844844
{
845845
ereport(LOG,
846-
(errmsg("could not start LDAP TLS session: error %d", r)));
846+
(errmsg("could not start LDAP TLS session: error code %d", r)));
847847
return STATUS_ERROR;
848848
}
849849
}
@@ -858,7 +858,7 @@ CheckLDAPAuth(Port *port)
858858
if (r != LDAP_SUCCESS)
859859
{
860860
ereport(LOG,
861-
(errmsg("LDAP login failed for user \"%s\" on server \"%s\": error %d",
861+
(errmsg("LDAP login failed for user \"%s\" on server \"%s\": error code %d",
862862
fulluser, server, r)));
863863
return STATUS_ERROR;
864864
}

‎src/backend/rewrite/rewriteRemove.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/rewrite/rewriteRemove.c,v 1.66 2006/09/05 21:08:36 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/rewrite/rewriteRemove.c,v 1.67 2006/10/03 21:21:36 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -61,7 +61,7 @@ RemoveRewriteRule(Oid owningRel, const char *ruleName, DropBehavior behavior,
6161
ruleName, get_rel_name(owningRel))));
6262
else
6363
ereport(NOTICE,
64-
(errmsg("rule \"%s\" for relation \"%s\" does not exist ... skipping",
64+
(errmsg("rule \"%s\" for relation \"%s\" does not exist, skipping",
6565
ruleName, get_rel_name(owningRel))));
6666
return;
6767
}

0 commit comments

Comments
 (0)