You are viewing a plain text version of this content. The canonical link for it is here.
Posted to websh-cvs@tcl.apache.org by ro...@apache.org on 2002/07/25 00:30:39 UTC
cvs commit: tcl-websh/src/generic cfg.c cfg.h request.c request.h tclAppInit.c web.c web.h
ronnie 2002/07/24 15:30:39
Modified: src/generic cfg.c cfg.h request.c request.h tclAppInit.c
web.c web.h
Log:
- added flag to Websh_Init, cfg_Init and request_Init
(proper initialization to fix memory leak)
Revision Changes Path
1.12 +3 -3 tcl-websh/src/generic/cfg.c
Index: cfg.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/cfg.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cfg.c 18 Apr 2002 14:40:11 -0000 1.11
+++ cfg.c 24 Jul 2002 22:30:39 -0000 1.12
@@ -30,7 +30,7 @@
/* ----------------------------------------------------------------------------
* Init --
* ------------------------------------------------------------------------- */
-int cfg_Init(Tcl_Interp * interp)
+int cfg_Init(Tcl_Interp * interp, int initial)
{
CfgData *cfgData;
@@ -62,7 +62,7 @@
/* -------------------------------------------------------------------------
* need an exit handler, too (if this is the main interp)
* ---------------------------------------------------------------------- */
- if (Tcl_GetMaster(interp) == NULL)
+ if (initial)
Tcl_CreateThreadExitHandler(dCfgData, (ClientData) cfgData);
/* -------------------------------------------------------------------------
1.4 +2 -2 tcl-websh/src/generic/cfg.h
Index: cfg.h
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/cfg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cfg.h 25 Oct 2001 17:50:13 -0000 1.3
+++ cfg.h 24 Jul 2002 22:30:39 -0000 1.4
@@ -42,7 +42,7 @@
CfgData *createCfgData(Tcl_Interp * interp);
void destroyCfgData(ClientData clientData, Tcl_Interp * interp);
-int cfg_Init(Tcl_Interp * interp);
+int cfg_Init(Tcl_Interp * interp, int initial);
int Web_Cfg(ClientData clientData,
Tcl_Interp * interp, int objc, Tcl_Obj * CONST objv[]);
1.13 +4 -5 tcl-websh/src/generic/request.c
Index: request.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/request.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- request.c 8 Mar 2002 09:31:45 -0000 1.12
+++ request.c 24 Jul 2002 22:30:39 -0000 1.13
@@ -34,7 +34,7 @@
/* ----------------------------------------------------------------------------
* Init --
* ------------------------------------------------------------------------- */
-int request_Init(Tcl_Interp * interp)
+int request_Init(Tcl_Interp * interp, int initial)
{
RequestData *requestData;
@@ -85,9 +85,8 @@
/* -------------------------------------------------------------------------
* need an exit handler, too (if this is the main interp)
* ---------------------------------------------------------------------- */
- if (Tcl_GetMaster(interp) == NULL)
- Tcl_CreateThreadExitHandler(dRequestData, (ClientData) requestData);
-
+ if (initial)
+ Tcl_CreateThreadExitHandler(dRequestData, (ClientData) requestData);
/* -------------------------------------------------------------------------
* done
* ---------------------------------------------------------------------- */
1.9 +2 -2 tcl-websh/src/generic/request.h
Index: request.h
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/request.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- request.h 18 Apr 2002 14:40:11 -0000 1.8
+++ request.h 24 Jul 2002 22:30:39 -0000 1.9
@@ -110,7 +110,7 @@
int removeTempFiles(Tcl_Interp * interp, RequestData * requestData);
-int request_Init(Tcl_Interp * interp);
+int request_Init(Tcl_Interp * interp, int initial);
int Web_Request(ClientData clientData,
Tcl_Interp * interp, int objc, Tcl_Obj * CONST objv[]);
1.3 +2 -2 tcl-websh/src/generic/tclAppInit.c
Index: tclAppInit.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/tclAppInit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclAppInit.c 25 Oct 2001 17:50:13 -0000 1.2
+++ tclAppInit.c 24 Jul 2002 22:30:39 -0000 1.3
@@ -178,7 +178,7 @@
*
* where "Mod" is the name of the module.
*/
- if (Websh_Init(interp) == TCL_ERROR) {
+ if (Websh_Init(interp, 1) == TCL_ERROR) {
return TCL_ERROR;
}
1.4 +4 -4 tcl-websh/src/generic/web.c
Index: web.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/web.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- web.c 25 Oct 2001 17:50:13 -0000 1.3
+++ web.c 24 Jul 2002 22:30:39 -0000 1.4
@@ -21,7 +21,7 @@
/* ----------------------------------------------------------------------------
* init --
* ------------------------------------------------------------------------- */
-int Websh_Init(Tcl_Interp * interp)
+int Websh_Init(Tcl_Interp * interp, int initial)
{
UrlData *urlData;
@@ -85,7 +85,7 @@
/* --------------------------------------------------------------------------
* request data management
* ----------------------------------------------------------------------- */
- if (request_Init(interp) == TCL_ERROR)
+ if (request_Init(interp, initial) == TCL_ERROR)
return TCL_ERROR;
/* --------------------------------------------------------------------------
@@ -107,7 +107,7 @@
/* --------------------------------------------------------------------------
* config
* ----------------------------------------------------------------------- */
- if (cfg_Init(interp) == TCL_ERROR)
+ if (cfg_Init(interp, initial) == TCL_ERROR)
return TCL_ERROR;
/* --------------------------------------------------------------------------
1.4 +2 -2 tcl-websh/src/generic/web.h
Index: web.h
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/web.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- web.h 25 Oct 2001 17:50:13 -0000 1.3
+++ web.h 24 Jul 2002 22:30:39 -0000 1.4
@@ -32,7 +32,7 @@
#include "filecounter.h"
#include "modwebsh.h"
-int Websh_Init(Tcl_Interp * interp);
+int Websh_Init(Tcl_Interp * interp, int initial);
int Script_Init(Tcl_Interp * interp);
---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org