Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 4d0fc1d

Browse files
committed
Don't use "#" as an abbreviation for "number" in PL/Tcl error messages.
Also, rewrite one error message to make it follow our message style guidelines better. Euler Taveira and Tom Lane
1 parent ad584a0 commit 4d0fc1d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/pl/tcl/pltcl.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1055,7 +1055,7 @@ pltcl_trigger_handler(PG_FUNCTION_ARGS, bool pltrusted)
10551055
if (ret_numvals % 2 != 0)
10561056
ereport(ERROR,
10571057
(errcode(ERRCODE_E_R_I_E_TRIGGER_PROTOCOL_VIOLATED),
1058-
errmsg("invalid return list from trigger - must have even # of elements")));
1058+
errmsg("trigger's return list must have even number of elements")));
10591059

10601060
modattrs = (int *) palloc(tupdesc->natts * sizeof(int));
10611061
modvalues = (Datum *) palloc(tupdesc->natts * sizeof(Datum));
@@ -2345,7 +2345,7 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp,
23452345
if (strlen(nulls) != qdesc->nargs)
23462346
{
23472347
Tcl_SetResult(interp,
2348-
"length of nulls string doesn't match # of arguments",
2348+
"length of nulls string doesn't match number of arguments",
23492349
TCL_STATIC);
23502350
return TCL_ERROR;
23512351
}
@@ -2370,12 +2370,12 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp,
23702370
return TCL_ERROR;
23712371

23722372
/************************************************************
2373-
* Check that the # of arguments matches
2373+
* Check that the number of arguments matches
23742374
************************************************************/
23752375
if (callnargs != qdesc->nargs)
23762376
{
23772377
Tcl_SetResult(interp,
2378-
"argument list length doesn't match # of arguments for query",
2378+
"argument list length doesn't match number of arguments for query",
23792379
TCL_STATIC);
23802380
ckfree((char *) callargs);
23812381
return TCL_ERROR;

0 commit comments

Comments
 (0)