[naviserver-commits] naviserver/nsd tclset.c,1.6,1.7

[Vlad S. <ser...@us...>]

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

Modified Files:
	tclset.c 
Log Message:
Tcl API changed back for non-default functions to check number of arguments


Index: tclset.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclset.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tclset.c	4 Aug 2005 21:54:26 -0000	1.6
--- tclset.c	4 Aug 2005 21:58:34 -0000	1.7
***************
*** 395,412 ****
  	    break;
  
- 	case SFindIdx:
- 	case SIFindIdx:
  	case SGetIdx:
  	case SIGetIdx:
- 	case SDelkeyIdx:
- 	case SIDelkeyIdx:
- 	case SUniqueIdx:
- 	case SIUniqueIdx:
- 	    /*
- 	     * These commands require a set and string key.
- 	     */
- 
              if (objc < 4) {
! 		Tcl_WrongNumArgs(interp, 2, objv, "setId key");
  		return TCL_ERROR;
              }
--- 395,402 ----
  	    break;
  
  	case SGetIdx:
  	case SIGetIdx:
              if (objc < 4) {
! 		Tcl_WrongNumArgs(interp, 2, objv, "setId key ?dflt?");
  		return TCL_ERROR;
              }
***************
*** 421,425 ****
                  Tcl_SetResult(interp, Ns_SetIGetValue(set, key, def), TCL_VOLATILE);
                  break;
! 		    
  	    case SIFindIdx:
  		objPtr = Tcl_NewIntObj(Ns_SetIFind(set, key));
--- 411,433 ----
                  Tcl_SetResult(interp, Ns_SetIGetValue(set, key, def), TCL_VOLATILE);
                  break;
!             }		    
!             break;
! 
! 	case SFindIdx:
! 	case SIFindIdx:
! 	case SDelkeyIdx:
! 	case SIDelkeyIdx:
! 	case SUniqueIdx:
! 	case SIUniqueIdx:
! 	    /*
! 	     * These commands require a set and string key.
! 	     */
! 
!             if (objc != 4) {
! 		Tcl_WrongNumArgs(interp, 2, objv, "setId key");
! 		return TCL_ERROR;
!             }
! 	    key = Tcl_GetString(objv[3]);
! 	    switch (opt) {
  	    case SIFindIdx:
  		objPtr = Tcl_NewIntObj(Ns_SetIFind(set, key));