7
7
*
8
8
*
9
9
* IDENTIFICATION
10
- * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.37 1998/10/02 01:37:17 tgl Exp $
10
+ * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.38 1998/10/14 15:17:51 tgl Exp $
11
11
*
12
12
*-------------------------------------------------------------------------
13
13
*/
@@ -1230,7 +1230,8 @@ Pg_select(ClientData cData, Tcl_Interp * interp, int argc, char **argv)
1230
1230
Pg_ConnectionId * connid ;
1231
1231
PGconn * conn ;
1232
1232
PGresult * result ;
1233
- int r ;
1233
+ int r ,
1234
+ retval ;
1234
1235
size_t tupno ,
1235
1236
column ,
1236
1237
ncols ;
@@ -1293,6 +1294,8 @@ Pg_select(ClientData cData, Tcl_Interp * interp, int argc, char **argv)
1293
1294
sprintf (buffer , "%d" , ncols );
1294
1295
Tcl_SetVar2 (interp , argv [3 ], ".numcols" , buffer , 0 );
1295
1296
1297
+ retval = TCL_OK ;
1298
+
1296
1299
for (tupno = 0 ; tupno < PQntuples (result ); tupno ++ )
1297
1300
{
1298
1301
sprintf (buffer , "%d" , tupno );
@@ -1306,10 +1309,7 @@ Pg_select(ClientData cData, Tcl_Interp * interp, int argc, char **argv)
1306
1309
if ((r = Tcl_Eval (interp , argv [4 ])) != TCL_OK && r != TCL_CONTINUE )
1307
1310
{
1308
1311
if (r == TCL_BREAK )
1309
- {
1310
- PQclear (result );
1311
- return TCL_OK ;
1312
- }
1312
+ break ; /* exit loop, but return TCL_OK */
1313
1313
1314
1314
if (r == TCL_ERROR )
1315
1315
{
@@ -1320,15 +1320,15 @@ Pg_select(ClientData cData, Tcl_Interp * interp, int argc, char **argv)
1320
1320
Tcl_AddErrorInfo (interp , msg );
1321
1321
}
1322
1322
1323
- PQclear ( result ) ;
1324
- return r ;
1323
+ retval = r ;
1324
+ break ;
1325
1325
}
1326
1326
}
1327
1327
1328
1328
ckfree ((void * ) info );
1329
1329
Tcl_UnsetVar (interp , argv [3 ], 0 );
1330
1330
PQclear (result );
1331
- return TCL_OK ;
1331
+ return retval ;
1332
1332
}
1333
1333
1334
1334
/*
0 commit comments