[naviserver-commits] naviserver/nsd init.tcl,1.2,1.3 tclcmds.c,1.18,1.19 tclinit.c,1.11,1.12

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/naviserver/nsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32374/nsd

Modified Files:
	init.tcl tclcmds.c tclinit.c 
Log Message:
        * nsd/tclinit.c:
        * nsd/tclcmds.c:
        * nsd/init.tcl: Remove ns_markfordelete command and roll into
        ns_ictl as ns_ictl markfordelete.


Index: tclcmds.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclcmds.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** tclcmds.c	12 Jul 2005 07:31:39 -0000	1.18
--- tclcmds.c	30 Jul 2005 03:35:10 -0000	1.19
***************
*** 106,110 ****
      NsTclLogObjCmd,
      NsTclLogRollObjCmd,
-     NsTclMarkForDeleteObjCmd,
      NsTclMkdirObjCmd,
      NsTclModulePathObjCmd,
--- 106,109 ----
***************
*** 289,293 ****
      {"ns_logctl", NULL, NsTclLogCtlObjCmd},
      {"ns_logroll", NULL, NsTclLogRollObjCmd},
-     {"ns_markfordelete", NULL, NsTclMarkForDeleteObjCmd},
      {"ns_mkdir", NULL, NsTclMkdirObjCmd},
      {"ns_mktemp", NsTclMkTempCmd, NULL},
--- 288,291 ----

Index: tclinit.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclinit.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tclinit.c	30 Jul 2005 03:17:50 -0000	1.11
--- tclinit.c	30 Jul 2005 03:35:11 -0000	1.12
***************
*** 754,765 ****
  
      static CONST char *opts[] = {
!         "addmodule", "cleanup", "epoch", "get", "getmodules", "save",
!         "update", "oncreate", "oncleanup", "oninit", "ondelete", "trace",
          NULL
      };
      enum {
          IAddModuleIdx, ICleanupIdx, IEpochIdx, IGetIdx, IGetModulesIdx,
!         ISaveIdx, IUpdateIdx, IOnCreateIdx, IOnCleanupIdx, IOnInitIdx,
!         IOnDeleteIdx, ITraceIdx
      };
      Ns_ObjvTable traceWhen[] = {
--- 754,765 ----
  
      static CONST char *opts[] = {
!         "addmodule", "cleanup", "epoch", "get", "getmodules", "markfordelete",
!         "save", "update", "oncreate", "oncleanup", "oninit", "ondelete", "trace",
          NULL
      };
      enum {
          IAddModuleIdx, ICleanupIdx, IEpochIdx, IGetIdx, IGetModulesIdx,
!         IMarkForDeleteIdx, ISaveIdx, IUpdateIdx, IOnCreateIdx, IOnCleanupIdx,
!         IOnInitIdx, IOnDeleteIdx, ITraceIdx
      };
      Ns_ObjvTable traceWhen[] = {
***************
*** 851,854 ****
--- 851,862 ----
          break;
  
+     case IMarkForDeleteIdx:
+         /*
+          * The interp will be deleted on next deallocation.
+          */
+ 
+         itPtr->delete = 1;
+         break;
+ 
      case ISaveIdx:
          /*
***************
*** 960,994 ****
   *----------------------------------------------------------------------
   *
-  * NsTclMarkForDeleteObjCmd --
-  *
-  *      Implements ns_markfordelete.
-  *
-  * Results:
-  *      Tcl result. 
-  *
-  * Side effects:
-  *      See Ns_TclMarkForDelete.
-  *
-  *----------------------------------------------------------------------
-  */
- 
- int
- NsTclMarkForDeleteObjCmd(ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj **objv)
- {
-     NsInterp *itPtr = arg;
- 
-     if (objc != 1) {
-         Tcl_WrongNumArgs(interp, 1, objv, "");
-         return TCL_ERROR;
-     }
-     itPtr->delete = 1;
- 
-     return TCL_OK;
- }
- 
- 
- /*
-  *----------------------------------------------------------------------
-  *
   * NsTclDummyObjCmd --
   *
--- 968,971 ----

Index: init.tcl
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/init.tcl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** init.tcl	14 May 2005 05:39:29 -0000	1.2
--- init.tcl	30 Jul 2005 03:35:10 -0000	1.3
***************
*** 148,152 ****
  
      } elseif {$code == 1} {
!         ns_markfordelete
      }
      return -code $code $result
--- 148,152 ----
  
      } elseif {$code == 1} {
!         ns_ictl markfordelete
      }
      return -code $code $result
***************
*** 665,669 ****
  #
  
! ns_markfordelete
  
  # EOF $RCSfile$
--- 665,669 ----
  #
  
! ns_ictl markfordelete
  
  # EOF $RCSfile$