[naviserver-commits] naviserver/nsd nsd.h,1.6,1.7 proc.c,1.2,1.3 tclrequest.c,1.1.1.1,1.2

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

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

Modified Files:
	nsd.h proc.c tclrequest.c 
Log Message:
* include/ns.h:
* nsd/nsd.h:
* nsd/proc.c:
* nsd/tclrequest.c: Convert to new callback and parse proc APIs.
Remove support for old connId parameter.

* tcl/file.tcl:
* tcl/util.tcl: Remove support for old connId parameter.


Index: tclrequest.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclrequest.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** tclrequest.c	16 Feb 2005 08:39:38 -0000	1.1.1.1
--- tclrequest.c	26 Mar 2005 17:42:26 -0000	1.2
***************
*** 1,7 ****
  /*
!  * The contents of this file are subject to the AOLserver Public License
   * Version 1.1 (the "License"); you may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
!  * http://aolserver.com/.
   *
   * Software distributed under the License is distributed on an "AS IS"
--- 1,7 ----
  /*
!  * The contents of this file are subject to the Mozilla Public License
[...965 lines suppressed...]
      result = Tcl_GetStringResult(interp);
      if (why == NS_FILTER_VOID_TRACE) {
!         status = NS_OK;
      } else if (status != TCL_OK) {
!         status = NS_ERROR;
      } else if (STREQ(result, "filter_ok")) {
!         status = NS_OK;
      } else if (STREQ(result, "filter_break")) {
!         status = NS_FILTER_BREAK;
      } else if (STREQ(result, "filter_return")) {
!         status = NS_FILTER_RETURN;
      } else {
!         Ns_Log(Warning, "tclfilter: %s return invalid result: %s",
!                cbPtr->script, result);
!         status = NS_ERROR;
      }
      Tcl_DStringFree(&cmd);
  
!     return status;
  }

Index: nsd.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/nsd.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** nsd.h	26 Mar 2005 16:40:40 -0000	1.6
--- nsd.h	26 Mar 2005 17:42:26 -0000	1.7
***************
*** 834,837 ****
--- 834,840 ----
  extern Ns_ThreadProc NsConnThread;
  extern Ns_ArgProc NsConnArgProc;
+ extern Ns_FilterProc NsTclFilter;
+ extern Ns_OpProc NsTclRequest;
+ extern Ns_OpProc NsAdpRequest;
  
  extern void NsGetCallbacks(Tcl_DString *dsPtr);

Index: proc.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/proc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** proc.c	26 Mar 2005 16:40:40 -0000	1.2
--- proc.c	26 Mar 2005 17:42:26 -0000	1.3
***************
*** 64,67 ****
--- 64,70 ----
  	{(void *) NsCachePurge, "ns:cachepurge", NsCacheArgProc},
  	{(void *) NsConnThread, "ns:connthread", NsConnArgProc},
+ 	{(void *) NsTclFilter, "ns:tclfilter", Ns_TclCallbackArgProc},
+ 	{(void *) NsTclRequest, "ns:tclrequest", Ns_TclCallbackArgProc},
+ 	{(void *) NsAdpRequest, "ns:adprequest", Ns_StringArgProc},
  	{NULL, NULL, NULL}
  };
***************
*** 189,192 ****
--- 192,220 ----
   *----------------------------------------------------------------------
   *
+  * Ns_StringArgProc --
+  *
+  *      Treat arg as cstring and copy to dstring.
+  *
+  * Results:
+  *      None. 
+  *
+  * Side effects:
+  *      None.
+  *
+  *----------------------------------------------------------------------
+  */
+ 
+ void
+ Ns_StringArgProc(Tcl_DString *dsPtr, void *arg)
+ {
+     char *str = arg;
+ 
+     Tcl_DStringAppendElement(dsPtr, str ? str : "");
+ }
+ 
+ 
+ /*
+  *----------------------------------------------------------------------
+  *
   * AppendAddr -- 
   *