Skip to content

Commit 53e6626

Browse files
committed
Switch out all Tcl_SetResult usage as per Victor Wagner
1 parent faafd29 commit 53e6626

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

src/pl/tcl/pltcl.c

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1965,7 +1965,8 @@ pltcl_SPI_execute(ClientData cdata, Tcl_Interp *interp,
19651965
{
19661966
Tcl_WrongNumArgs(interp, 1, objv,
19671967
"?-count n? ?-array name? query ?loop body?");
1968-
Tcl_SetResult(interp, usage, TCL_STATIC);
1968+
Tcl_SetObjResult(interp,
1969+
Tcl_NewStringObj(usage, -1));
19691970
return TCL_ERROR;
19701971
}
19711972

@@ -2001,7 +2002,8 @@ pltcl_SPI_execute(ClientData cdata, Tcl_Interp *interp,
20012002
query_idx = i;
20022003
if (query_idx >= objc || query_idx + 2 < objc)
20032004
{
2004-
Tcl_SetResult(interp, usage, TCL_STATIC);
2005+
Tcl_SetObjResult(interp,
2006+
Tcl_NewStringObj(usage, -1));
20052007
Tcl_WrongNumArgs(interp, query_idx - 1, objv, "query ?loop body?");
20062008
return TCL_ERROR;
20072009
}
@@ -2385,9 +2387,10 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp,
23852387
{
23862388
if (strlen(nulls) != qdesc->nargs)
23872389
{
2388-
Tcl_SetResult(interp,
2390+
Tcl_SetObjResult(interp,
2391+
Tcl_NewStringObj(
23892392
"length of nulls string doesn't match number of arguments",
2390-
TCL_STATIC);
2393+
-1));
23912394
return TCL_ERROR;
23922395
}
23932396
}
@@ -2401,7 +2404,10 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp,
24012404

24022405
if (i >= objc)
24032406
{
2404-
Tcl_SetResult(interp, "missing argument list", TCL_STATIC);
2407+
Tcl_SetObjResult(interp,
2408+
Tcl_NewStringObj(
2409+
"argument list length doesn't match number of arguments for query"
2410+
, -1));
24052411
return TCL_ERROR;
24062412
}
24072413

@@ -2416,9 +2422,10 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp,
24162422
************************************************************/
24172423
if (callObjc != qdesc->nargs)
24182424
{
2419-
Tcl_SetResult(interp,
2420-
"argument list length doesn't match number of arguments for query",
2421-
TCL_STATIC);
2425+
Tcl_SetObjResult(interp,
2426+
Tcl_NewStringObj(
2427+
"argument list length doesn't match number of arguments for query"
2428+
, -1));
24222429
return TCL_ERROR;
24232430
}
24242431
}
@@ -2433,7 +2440,8 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp,
24332440

24342441
if (i != objc)
24352442
{
2436-
Tcl_SetResult(interp, usage, TCL_STATIC);
2443+
Tcl_SetObjResult(interp,
2444+
Tcl_NewStringObj(usage, -1));
24372445
return TCL_ERROR;
24382446
}
24392447

0 commit comments

Comments
 (0)