naviserver-commits — Commit notices

[naviserver-commits] modules/nsaspell nsaspell.c,1.2,1.3

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

Update of /cvsroot/naviserver/modules/nsaspell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18236/nsaspell

Modified Files:
	nsaspell.c 
Log Message:
compiler warnings silence


Index: nsaspell.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsaspell/nsaspell.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nsaspell.c	8 Jun 2005 20:03:37 -0000	1.2
--- nsaspell.c	12 Jun 2005 22:34:21 -0000	1.3
***************
*** 80,84 ****
  AspellCmd(void *context,Tcl_Interp *interp,int objc,Tcl_Obj * CONST objv[])
  {
!     int i;
      AspellSession *asp;
      AspellConfig *config;
--- 80,84 ----
  AspellCmd(void *context,Tcl_Interp *interp,int objc,Tcl_Obj * CONST objv[])
  {
!     int i,cmd;
      AspellSession *asp;
      AspellConfig *config;
***************
*** 105,111 ****
          cmdCheckText,
          cmdSuggestText
!     } cmd;
        
!     static char *sCmd[] = {
          "sessions",
          "create",
--- 105,111 ----
          cmdCheckText,
          cmdSuggestText
!     };
        
!     static const char *sCmd[] = {
          "sessions",
          "create",
***************
*** 410,414 ****
      AspellStringEnumeration *els;
      Tcl_Obj *list = Tcl_NewListObj(0,0);
!     char *encoding = aspell_config_retrieve(asp->config,"encoding");
  
      aspell_document_checker_reset(asp->checker);
--- 410,414 ----
      AspellStringEnumeration *els;
      Tcl_Obj *list = Tcl_NewListObj(0,0);
!     char *encoding = (char*)aspell_config_retrieve(asp->config,"encoding");
  
      aspell_document_checker_reset(asp->checker);
***************
*** 430,437 ****
        if(suggest) {
          Tcl_Obj *list2 = Tcl_NewListObj(0,0);
!         wl = aspell_speller_suggest(asp->speller,word,-1);
          if(!aspell_word_list_empty(wl)) {
            els = aspell_word_list_elements(wl);
!           while((s = aspell_string_enumeration_next(els)))
              Tcl_ListObjAppendElement(interp,list2,Tcl_NewStringObj(s,-1));
          }
--- 430,437 ----
        if(suggest) {
          Tcl_Obj *list2 = Tcl_NewListObj(0,0);
!         wl = (AspellWordList*)aspell_speller_suggest(asp->speller,word,-1);
          if(!aspell_word_list_empty(wl)) {
            els = aspell_word_list_elements(wl);
!           while((s = (char*)aspell_string_enumeration_next(els)))
              Tcl_ListObjAppendElement(interp,list2,Tcl_NewStringObj(s,-1));
          }

[naviserver-commits] modules/nszlib Makefile,1.1.1.1,1.2 nszlib.c,1.2,1.3

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

Update of /cvsroot/naviserver/modules/nszlib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18236/nszlib

Modified Files:
	Makefile nszlib.c 
Log Message:
compiler warnings silence


Index: Makefile
===================================================================
RCS file: /cvsroot/naviserver/modules/nszlib/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile	20 May 2005 20:48:23 -0000	1.1.1.1
--- Makefile	12 Jun 2005 22:34:24 -0000	1.2
***************
*** 1,4 ****
  ifndef NAVISERVER
!     NAVISERVER  = /usr/local/ns       
  endif
  
--- 1,4 ----
  ifndef NAVISERVER
!   NAVISERVER  = /usr/local/ns
  endif
  
***************
*** 15,17 ****
  MODLIBS	 = -lz
  
! include  $(NAVISERVER)/include/Makefile.module
--- 15,17 ----
  MODLIBS	 = -lz
  
! include $(NAVISERVER)/include/Makefile.module

Index: nszlib.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nszlib/nszlib.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nszlib.c	8 Jun 2005 20:03:51 -0000	1.2
--- nszlib.c	12 Jun 2005 22:34:24 -0000	1.3
***************
*** 84,90 ****
  int ZlibCmd(void *context,Tcl_Interp *interp,int objc,Tcl_Obj * CONST objv[])
  {
!     int rc;
      unsigned char *inbuf,*outbuf;
!     unsigned long inlen,outlen,crc;
  
      if (objc < 3) {
--- 84,90 ----
  int ZlibCmd(void *context,Tcl_Interp *interp,int objc,Tcl_Obj * CONST objv[])
  {
!     int rc,inlen;
      unsigned char *inbuf,*outbuf;
!     unsigned long outlen,crc;
  
      if (objc < 3) {

[naviserver-commits] modules/nssnmp nssnmp.c,1.3,1.4

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

Update of /cvsroot/naviserver/modules/nssnmp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18236/nssnmp

Modified Files:
	nssnmp.c 
Log Message:
compiler warnings silence


Index: nssnmp.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nssnmp/nssnmp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** nssnmp.c	9 Jun 2005 21:31:30 -0000	1.3
--- nssnmp.c	12 Jun 2005 22:34:24 -0000	1.4
***************
*** 454,464 ****
  static int UdpCmd(ClientData arg, Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[]);
  static int SnmpCmd(ClientData arg, Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[]);
! static int TrapCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv);
! static int MibCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv);
! static int PingCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv);
! static int IcmpCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv);
! static int RadiusCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv);
! static int RadiusDictCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv);
! static int RadiusClientCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv);
  static void TrapDump(Server *server,Pdu &pdu,SnmpTarget &target);
  static const char *SnmpError(SnmpSession *session,int status);
--- 454,464 ----
  static int UdpCmd(ClientData arg, Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[]);
  static int SnmpCmd(ClientData arg, Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[]);
! static int TrapCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv);
! static int MibCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv);
! static int PingCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv);
! static int IcmpCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv);
! static int RadiusCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv);
! static int RadiusDictCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv);
! static int RadiusClientCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv);
  static void TrapDump(Server *server,Pdu &pdu,SnmpTarget &target);
  static const char *SnmpError(SnmpSession *session,int status);
***************
*** 712,716 ****
   */
  
! static int TrapCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv)
  {
      TrapContext *ctx = (TrapContext *)arg;
--- 712,716 ----
   */
  
! static int TrapCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv)
  {
      TrapContext *ctx = (TrapContext *)arg;
***************
*** 945,949 ****
        if(now - session->access_time > server->idle_timeout) {
          SnmpSession *next = (SnmpSession*)session->next;
!         Ns_Log(Notice,"ns_snmp: GC: inactive session %d: %s",session->id,session->addr->get_printable());
          SessionUnlink(server,session,0);
          session = next;
--- 945,949 ----
        if(now - session->access_time > server->idle_timeout) {
          SnmpSession *next = (SnmpSession*)session->next;
!         Ns_Log(Notice,"ns_snmp: GC: inactive session %ld: %s",session->id,session->addr->get_printable());
          SessionUnlink(server,session,0);
          session = next;
***************
*** 1080,1084 ****
  {
      Server *server = (Server*)arg;
!     int status,id;
      SnmpSession *session;
      enum commands {
--- 1080,1084 ----
  {
      Server *server = (Server*)arg;
!     int cmd,status,id;
      SnmpSession *session;
      enum commands {
***************
*** 1086,1092 ****
          cmdConfig, cmdGet, cmdWalk, cmdSet, 
          cmdTrap, cmdInform, cmdDestroy
!     } cmd;
  
!     static char *sCmd[] = {
          "gc", "sessions", "create",
          "config", "get", "walk", "set", 
--- 1086,1092 ----
          cmdConfig, cmdGet, cmdWalk, cmdSet, 
          cmdTrap, cmdInform, cmdDestroy
!     };
  
!     static const char *sCmd[] = {
          "gc", "sessions", "create",
          "config", "get", "walk", "set", 
***************
*** 1475,1479 ****
  }
  
! static int MibCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv)
  {
      Server *server = (Server*)arg;
--- 1475,1479 ----
  }
  
! static int MibCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv)
  {
      Server *server = (Server*)arg;
***************
*** 1488,1493 ****
  
      if(!strcmp(argv[1],"labels")) {
!       char *pattern = (argc > 2 ? argv[2] : 0);
!       char *syntax = (argc > 3 ? argv[3] : 0);
        Tcl_HashSearch search;
  
--- 1488,1493 ----
  
      if(!strcmp(argv[1],"labels")) {
!       char *pattern = (argc > 2 ? (char*)argv[2] : 0);
!       char *syntax = (argc > 3 ? (char*)argv[3] : 0);
        Tcl_HashSearch search;
  
***************
*** 1614,1618 ****
          } else
          if(mib->hint) {
!           FormatIntTC(interp,argv[3],mib->hint);
            return TCL_OK;
          }
--- 1614,1618 ----
          } else
          if(mib->hint) {
!           FormatIntTC(interp,(char*)argv[3],mib->hint);
            return TCL_OK;
          }
***************
*** 1620,1627 ****
  
        if(!strcmp(mib->syntax,"OCTET STRING") && mib->hint) {
!         FormatStringTC(interp,argv[3],mib->hint);
          return TCL_OK;
        }
!       Tcl_AppendResult(interp,argv[3],0);
      } else
  
--- 1620,1627 ----
  
        if(!strcmp(mib->syntax,"OCTET STRING") && mib->hint) {
!         FormatStringTC(interp,(char*)argv[3],mib->hint);
          return TCL_OK;
        }
!       Tcl_AppendResult(interp,(char*)argv[3],0);
      } else
  
***************
*** 1719,1723 ****
  
  // Check host availability by simulating PING
! static int IcmpCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv)
  {
     Server *server = (Server*)arg;
--- 1719,1723 ----
  
  // Check host availability by simulating PING
! static int IcmpCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv)
  {
     Server *server = (Server*)arg;
***************
*** 1742,1746 ****
  
  // Check host availability by simulating PING
! static int PingCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv)
  {
     Server *server = (Server*)arg;
--- 1742,1746 ----
  
  // Check host availability by simulating PING
! static int PingCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv)
  {
     Server *server = (Server*)arg;
***************
*** 1780,1784 ****
     fd_set fds;
  
!    if(Ns_GetSockAddr(&addr,argv[1],0) != NS_OK) {
       Tcl_AppendResult(interp,"noHost: unknown host: ",argv[1],0);
       return TCL_ERROR;
--- 1780,1784 ----
     fd_set fds;
  
!    if(Ns_GetSockAddr(&addr,(char*)argv[1],0) != NS_OK) {
       Tcl_AppendResult(interp,"noHost: unknown host: ",argv[1],0);
       return TCL_ERROR;
***************
*** 2008,2011 ****
--- 2008,2014 ----
   *
   * $Log$
+  * Revision 1.4  2005/06/12 22:34:24  seryakov
+  * compiler warnings silence
+  *
   * Revision 1.3  2005/06/09 21:31:30  seryakov
   * rewrote nssnmp's ns_udp using new Objv interface, added to nsudp's ns_udp -retries
***************
*** 2763,2767 ****
   *----------------------------------------------------------------------
   */
! static int RadiusCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv)
  {
      fd_set rfds;
--- 2766,2770 ----
   *----------------------------------------------------------------------
   */
! static int RadiusCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv)
  {
      fd_set rfds;
***************
*** 2784,2788 ****
      }
      if(!(port = atoi(argv[2]))) port = RADIUS_AUTH_PORT;
!     if(Ns_GetSockAddr((sockaddr_in*)&sa,argv[1],port) != NS_OK) {
        Tcl_AppendResult(interp,"noHost: unknown host: ",argv[1],0);
        return TCL_ERROR;
--- 2787,2791 ----
      }
      if(!(port = atoi(argv[2]))) port = RADIUS_AUTH_PORT;
!     if(Ns_GetSockAddr((sockaddr_in*)&sa,(char*)argv[1],port) != NS_OK) {
        Tcl_AppendResult(interp,"noHost: unknown host: ",argv[1],0);
        return TCL_ERROR;
***************
*** 2792,2796 ****
        if(!strcasecmp(argv[i],"Retries")) retries = atoi(argv[i+1]); else
        if(!strcasecmp(argv[i],"Timeout")) timeout = atoi(argv[i+1]); else {
!         if((attr = RadiusAttrCreate(argv[i],0,0,(unsigned char*)argv[i+1],-1)))
            RadiusAttrLink(&vp,attr);
          else {
--- 2795,2799 ----
        if(!strcasecmp(argv[i],"Retries")) retries = atoi(argv[i+1]); else
        if(!strcasecmp(argv[i],"Timeout")) timeout = atoi(argv[i+1]); else {
!         if((attr = RadiusAttrCreate((char*)argv[i],0,0,(unsigned char*)argv[i+1],-1)))
            RadiusAttrLink(&vp,attr);
          else {
***************
*** 2808,2812 ****
      hdr = (RadiusHeader *)buffer;
      RadiusVectorCreate(vector);
!     RadiusHeaderPack(hdr,0,code,vector,vp,argv[3]);
      RadiusAttrFree(&vp);
      memcpy(vector,hdr->vector,RADIUS_VECTOR_LEN);
--- 2811,2815 ----
      hdr = (RadiusHeader *)buffer;
      RadiusVectorCreate(vector);
!     RadiusHeaderPack(hdr,0,code,vector,vp,(char*)argv[3]);
      RadiusAttrFree(&vp);
      memcpy(vector,hdr->vector,RADIUS_VECTOR_LEN);
***************
*** 2847,2851 ****
      }
      // Verify reply md5 digest
!     if(RadiusVectorVerify(hdr,vector,argv[3])) {
        Tcl_AppendResult(interp,"noResponse: invalid reply digest",0);
        return TCL_ERROR;
--- 2850,2854 ----
      }
      // Verify reply md5 digest
!     if(RadiusVectorVerify(hdr,vector,(char*)argv[3])) {
        Tcl_AppendResult(interp,"noResponse: invalid reply digest",0);
        return TCL_ERROR;
***************
*** 2853,2857 ****
      Ns_DStringInit(&ds);
      Ns_DStringPrintf(&ds,"code %d id %d ipaddr %s ",hdr->code,hdr->id,ns_inet_ntoa(sa.sin_addr));
!     if((vp = RadiusAttrParse(hdr,len,argv[3]))) {
        RadiusAttrPrintf(vp,&ds,1,1);
        RadiusAttrFree(&vp);
--- 2856,2860 ----
      Ns_DStringInit(&ds);
      Ns_DStringPrintf(&ds,"code %d id %d ipaddr %s ",hdr->code,hdr->id,ns_inet_ntoa(sa.sin_addr));
!     if((vp = RadiusAttrParse(hdr,len,(char*)argv[3]))) {
        RadiusAttrPrintf(vp,&ds,1,1);
        RadiusAttrFree(&vp);
***************
*** 2877,2881 ****
   *----------------------------------------------------------------------
   */
! static int RadiusDictCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv)
  {
      int n;
--- 2880,2884 ----
   *----------------------------------------------------------------------
   */
! static int RadiusDictCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv)
  {
      int n;
***************
*** 2904,2908 ****
        if(!strcmp(argv[5],"date")) n = RADIUS_TYPE_DATE; else n = atoi(argv[5]);
        if(!RadiusDictFind(atoi(argv[3]),atoi(argv[4]),0))
!         RadiusDictAdd(argv[2],atoi(argv[3]),atoi(argv[4]),n);
      } else
      if(!strcmp(argv[1],"get")) {
--- 2907,2911 ----
        if(!strcmp(argv[5],"date")) n = RADIUS_TYPE_DATE; else n = atoi(argv[5]);
        if(!RadiusDictFind(atoi(argv[3]),atoi(argv[4]),0))
!         RadiusDictAdd((char*)argv[2],atoi(argv[3]),atoi(argv[4]),n);
      } else
      if(!strcmp(argv[1],"get")) {
***************
*** 2914,2918 ****
          dict = RadiusDictFind(n,argc > 3 ? atoi(argv[3]): 0,1);
        else
!         dict = RadiusDictFindName(argv[2],argc > 3 ? atoi(argv[3]): 0,1);
        if(dict) {
          char buffer[256];
--- 2917,2921 ----
          dict = RadiusDictFind(n,argc > 3 ? atoi(argv[3]): 0,1);
        else
!         dict = RadiusDictFindName((char*)argv[2],argc > 3 ? atoi(argv[3]): 0,1);
        if(dict) {
          char buffer[256];
***************
*** 2929,2933 ****
          dict = RadiusDictFind(n,argc > 3 ? atoi(argv[3]): 0,1);
        else
!         dict = RadiusDictFindName(argv[2],argc > 3 ? atoi(argv[3]): 0,1);
        ns_free(dict);
      }
--- 2932,2936 ----
          dict = RadiusDictFind(n,argc > 3 ? atoi(argv[3]): 0,1);
        else
!         dict = RadiusDictFindName((char*)argv[2],argc > 3 ? atoi(argv[3]): 0,1);
        ns_free(dict);
      }
***************
*** 2950,2954 ****
   *----------------------------------------------------------------------
   */
! static int RadiusClientCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv)
  {
      Ns_DString ds;
--- 2953,2957 ----
   *----------------------------------------------------------------------
   */
! static int RadiusClientCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv)
  {
      Ns_DString ds;
***************
*** 2966,2970 ****
          return TCL_ERROR;
        }
!       if(Ns_GetSockAddr(&addr,argv[2],0) == NS_OK && (client = RadiusClientFind(server,addr.sin_addr,0)))
          Tcl_AppendResult(interp,client->secret,0);
      } else
--- 2969,2973 ----
          return TCL_ERROR;
        }
!       if(Ns_GetSockAddr(&addr,(char*)argv[2],0) == NS_OK && (client = RadiusClientFind(server,addr.sin_addr,0)))
          Tcl_AppendResult(interp,client->secret,0);
      } else
***************
*** 2975,2979 ****
          return TCL_ERROR;
        }
!       RadiusClientAdd(server,argv[2],argv[3]);
      } else
  
--- 2978,2982 ----
          return TCL_ERROR;
        }
!       RadiusClientAdd(server,(char*)argv[2],(char*)argv[3]);
      } else
  
***************
*** 2983,2987 ****
          return TCL_ERROR;
        }
!       if(Ns_GetSockAddr(&addr,argv[2],0) == NS_OK) client = RadiusClientFind(server,addr.sin_addr,1);
        ns_free(client);
      } else
--- 2986,2990 ----
          return TCL_ERROR;
        }
!       if(Ns_GetSockAddr(&addr,(char*)argv[2],0) == NS_OK) client = RadiusClientFind(server,addr.sin_addr,1);
        ns_free(client);
      } else
***************
*** 3012,3016 ****
   */
  
! static int RadiusReqCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv)
  {
      Ns_DString ds;
--- 3015,3019 ----
   */
  
! static int RadiusReqCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv)
  {
      Ns_DString ds;
***************
*** 3042,3046 ****
        } else
        if((atoi(argv[2]) > 0 && (attr = RadiusAttrFind(req->req,atoi(argv[2]),vendor))) ||
!          (attr = RadiusAttrFindName(req->req,argv[2],vendor))) {
          RadiusAttrPrintf(attr,&ds,0,0);
        }
--- 3045,3049 ----
        } else
        if((atoi(argv[2]) > 0 && (attr = RadiusAttrFind(req->req,atoi(argv[2]),vendor))) ||
!          (attr = RadiusAttrFindName(req->req,(char*)argv[2],vendor))) {
          RadiusAttrPrintf(attr,&ds,0,0);
        }
***************
*** 3054,3058 ****
            req->reply_code = atoi(argv[i+1]);
          else
!         if((attr = RadiusAttrCreate(argv[i],atoi(argv[i]),0,(unsigned char*)argv[i+1],-1)))
            RadiusAttrLink(&req->reply,attr);
        }
--- 3057,3061 ----
            req->reply_code = atoi(argv[i+1]);
          else
!         if((attr = RadiusAttrCreate((char*)argv[i],atoi(argv[i]),0,(unsigned char*)argv[i+1],-1)))
            RadiusAttrLink(&req->reply,attr);
        }

[naviserver-commits] modules/nsgdchart gdchart.c,1.2,1.3 nsgdchart.c,1.2,1.3

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

Update of /cvsroot/naviserver/modules/nsgdchart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18236/nsgdchart

Modified Files:
	gdchart.c nsgdchart.c 
Log Message:
compiler warnings silence


Index: nsgdchart.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsgdchart/nsgdchart.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nsgdchart.c	8 Jun 2005 20:03:46 -0000	1.2
--- nsgdchart.c	12 Jun 2005 22:34:23 -0000	1.3
***************
*** 79,83 ****
  GDCCmd(ClientData arg,Tcl_Interp * interp,int objc,Tcl_Obj * CONST objv[])
  {
!     int i,j,k,argc;
      Tcl_Obj **argv;
      char *val;
--- 79,83 ----
  GDCCmd(ClientData arg,Tcl_Interp * interp,int objc,Tcl_Obj * CONST objv[])
  {
!     int i,j,k,argc,opt,cmd;
      Tcl_Obj **argv;
      char *val;
***************
*** 87,92 ****
  	cmdCreate,cmdSet,cmdSetData,cmdSetLabels,cmdSetColors,cmdSkipLabels,
          cmdSave,cmdDestroy
!     } cmd;
!     static char *Cmds[] = {
  	"create","set","setdata","setlabels","setcolors","skiplabels",
          "save","destroy",
--- 87,92 ----
  	cmdCreate,cmdSet,cmdSetData,cmdSetLabels,cmdSetColors,cmdSkipLabels,
          cmdSave,cmdDestroy
!     };
!     static const char *Cmds[] = {
  	"create","set","setdata","setlabels","setcolors","skiplabels",
          "save","destroy",
***************
*** 94,98 ****
      };
  
!     static char *Types[] = {
  	"line","area","bar","floatingbar","hiloclose","combolinebar","combohlcbar",
          "combolinearea","combolineline","combohlcarea","3dhiloclose",
--- 94,98 ----
      };
  
!     static const char *Types[] = {
  	"line","area","bar","floatingbar","hiloclose","combolinebar","combohlcbar",
          "combolinearea","combolineline","combohlcarea","3dhiloclose",
***************
*** 116,121 ****
          optLegend,optLegendX,optLegendY,optLegendColor,optHardWidth,optHardHeight,
          optHardXOrig,optHardYOrig,optGridOnTop
!     } opt;
!     static char *Opts[] = {
  	"type","bgcolor","plotcolor","title","titlefont","titleptsize",
          "xtitle","xtitlefont","xtitleptsize","ytitle","ytitlefont","ytitleptsize",
--- 116,121 ----
          optLegend,optLegendX,optLegendY,optLegendColor,optHardWidth,optHardHeight,
          optHardXOrig,optHardYOrig,optGridOnTop
!     };
!     static const char *Opts[] = {
  	"type","bgcolor","plotcolor","title","titlefont","titleptsize",
          "xtitle","xtitlefont","xtitleptsize","ytitle","ytitlefont","ytitleptsize",

Index: gdchart.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsgdchart/gdchart.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gdchart.c	8 Jun 2005 20:03:46 -0000	1.2
--- gdchart.c	12 Jun 2005 22:34:23 -0000	1.3
***************
*** 1018,1029 ****
        /* if lowest < 0 < highest                                                  */
        for(i = -1; i <= 1; i += 2) {	/* -1,1 */
! 	if(i == -1)
  	  if(lowest >= 0.0) continue;
! 	else
  	  tmp_y = MIN(0,highest);	/*      step down to lowest */
! 	if(i == 1)
  	  if(highest <= 0.0) continue;
!        	else
        	  tmp_y = MAX(0,lowest);	/*      step up to highest */
  	do {
  	   int n,d,w;
--- 1018,1031 ----
        /* if lowest < 0 < highest                                                  */
        for(i = -1; i <= 1; i += 2) {	/* -1,1 */
! 	if(i == -1) {
  	  if(lowest >= 0.0) continue;
! 	} else {
  	  tmp_y = MIN(0,highest);	/*      step down to lowest */
!         }
! 	if(i == 1) {
  	  if(highest <= 0.0) continue;
!        	} else {
        	  tmp_y = MAX(0,lowest);	/*      step up to highest */
+         }
  	do {
  	   int n,d,w;

[naviserver-commits] modules/nssavi nssavi.c,1.2,1.3

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

Update of /cvsroot/naviserver/modules/nssavi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18236/nssavi

Modified Files:
	nssavi.c 
Log Message:
compiler warnings silence


Index: nssavi.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nssavi/nssavi.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nssavi.c	8 Jun 2005 20:03:49 -0000	1.2
--- nssavi.c	12 Jun 2005 22:34:23 -0000	1.3
***************
*** 114,123 ****
  SAVICmd(void *context,Tcl_Interp *interp,int objc,Tcl_Obj * CONST objv[])
  {
      enum commands {
          cmdSweepFile,
          cmdSweepBuffer
!     } cmd;
        
!     static char *sCmd[] = {
          "sweepfile",
          "sweepbuffer",
--- 114,124 ----
  SAVICmd(void *context,Tcl_Interp *interp,int objc,Tcl_Obj * CONST objv[])
  {
+     int cmd;
      enum commands {
          cmdSweepFile,
          cmdSweepBuffer
!     };
        
!     static const char *sCmd[] = {
          "sweepfile",
          "sweepbuffer",

[naviserver-commits] modules/nsocaml nsocaml.c,1.2,1.3

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

Update of /cvsroot/naviserver/modules/nsocaml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18236/nsocaml

Modified Files:
	nsocaml.c 
Log Message:
compiler warnings silence


Index: nsocaml.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsocaml/nsocaml.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nsocaml.c	8 Jun 2005 20:03:48 -0000	1.2
--- nsocaml.c	12 Jun 2005 22:34:23 -0000	1.3
***************
*** 87,96 ****
  OCAMLCmd(void *context,Tcl_Interp *interp,int objc,Tcl_Obj * CONST objv[])
  {
      value *fn, res, arg = Val_unit;
      enum commands {
          cmdCall, cmdLoad
!     } cmd;
        
!     static char *sCmd[] = {
          "call", "load",
          0
--- 87,97 ----
  OCAMLCmd(void *context,Tcl_Interp *interp,int objc,Tcl_Obj * CONST objv[])
  {
+     int cmd;
      value *fn, res, arg = Val_unit;
      enum commands {
          cmdCall, cmdLoad
!     };
        
!     static const char *sCmd[] = {
          "call", "load",
          0

[naviserver-commits] modules/nsfortune nsfortune.c,1.2,1.3

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

Update of /cvsroot/naviserver/modules/nsfortune
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18236/nsfortune

Modified Files:
	nsfortune.c 
Log Message:
compiler warnings silence


Index: nsfortune.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsfortune/nsfortune.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nsfortune.c	8 Jun 2005 20:03:43 -0000	1.2
--- nsfortune.c	12 Jun 2005 22:34:22 -0000	1.3
***************
*** 84,92 ****
  {
      NsFortuneServer *fortune = (NsFortuneServer*)data;
! 
      enum cmds {
  	cmdAddFile,cmdAddPath,cmdFortune,cmdStat
!     } cmd;
!     static char *Cmds[] = {
          "addfile","addpath","fortune","stat",0
      };
--- 84,92 ----
  {
      NsFortuneServer *fortune = (NsFortuneServer*)data;
!     int cmd;
      enum cmds {
  	cmdAddFile,cmdAddPath,cmdFortune,cmdStat
!     };
!     static const char *Cmds[] = {
          "addfile","addpath","fortune","stat",0
      };
***************
*** 198,202 ****
      fread(buf,fortune->offset_list[i].size,1,fp);
      fclose(fp);
!     Tcl_SetResult(interp,buf,ns_free);
  }
  
--- 198,202 ----
      fread(buf,fortune->offset_list[i].size,1,fp);
      fclose(fp);
!     Tcl_SetResult(interp,buf,(Tcl_FreeProc*)ns_free);
  }
  

[naviserver-commits] modules/nsimap nsimap.c,1.2,1.3

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

Update of /cvsroot/naviserver/modules/nsimap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18236/nsimap

Modified Files:
	nsimap.c 
Log Message:
compiler warnings silence


Index: nsimap.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsimap/nsimap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nsimap.c	8 Jun 2005 20:03:47 -0000	1.2
--- nsimap.c	12 Jun 2005 22:34:23 -0000	1.3
***************
*** 408,412 ****
  {
      if(!session) return;
!     if(server->debug) Ns_Log(Debug,"ns_imap: free: 0x%x: %d",session,session->id);
  
      /* Call atclose Tcl handler */
--- 408,412 ----
  {
      if(!session) return;
!     if(server->debug) Ns_Log(Debug,"ns_imap: free: 0x%p: %ld",session,session->id);
  
      /* Call atclose Tcl handler */
***************
*** 486,490 ****
        if(!strcmp(cmd,"-shortcache")) flags |= OP_SHORTCACHE;
      }
!     if(server->debug) Ns_Log(Debug,"ns_imap: open: 0x%x: %d: %s: %s",session,session->id,session->mailbox,session->user);
      Ns_TlsSet(&mailTls,session);
      if(!session->mailbox || !(session->stream = mail_open(session->stream,session->mailbox,flags))) {
--- 486,490 ----
        if(!strcmp(cmd,"-shortcache")) flags |= OP_SHORTCACHE;
      }
!     if(server->debug) Ns_Log(Debug,"ns_imap: open: 0x%p: %ld: %s: %s",session,session->id,session->mailbox,session->user);
      Ns_TlsSet(&mailTls,session);
      if(!session->mailbox || !(session->stream = mail_open(session->stream,session->mailbox,flags))) {
***************
*** 712,716 ****
        if(now - session->access_time > idle_timeout) {
          mailSession *next = session->next;
!         Ns_Log(Notice,"ns_imap: GC: inactive session %d: %s",session->id,session->stream->mailbox);
          Ns_TlsSet(&mailTls,session);
          /* In case of panic we will be thrown here again */
--- 712,716 ----
        if(now - session->access_time > idle_timeout) {
          mailSession *next = session->next;
!         Ns_Log(Notice,"ns_imap: GC: inactive session %ld: %s",session->id,session->stream->mailbox);
          Ns_TlsSet(&mailTls,session);
          /* In case of panic we will be thrown here again */
***************
*** 740,744 ****
  MailCmd(ClientData arg,Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[])
  {
!     int index;
      unsigned int num;
      mailSession *session = 0;
--- 740,744 ----
  MailCmd(ClientData arg,Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[])
  {
!     int index,cmd;
      unsigned int num;
      mailSession *session = 0;
***************
*** 755,761 ****
          cmdUnsubscribe, cmdNmsgs, cmdNrecent, cmdSort, cmdBodyStruct, cmdUid,
          cmdHeader, cmdGetParam, cmdSetParam, cmdSetQuota, cmdGetQuota, cmdSetAcl
!     } cmd;
  
!     static char *sCmd[] = {
          "gc", "sessions", "decode", "encode", "parsedate", "striphtml",
          "open",
--- 755,761 ----
          cmdUnsubscribe, cmdNmsgs, cmdNrecent, cmdSort, cmdBodyStruct, cmdUid,
          cmdHeader, cmdGetParam, cmdSetParam, cmdSetQuota, cmdGetQuota, cmdSetAcl
!     };
  
!     static const char *sCmd[] = {
          "gc", "sessions", "decode", "encode", "parsedate", "striphtml",
          "open",
***************
*** 854,858 ****
          // Decode text into plain 8bit string
          char *data;
!         unsigned long len = 0;
          if(objc < 4) {
            Tcl_AppendResult(interp, "wrong # args: should be ns_imap ",sCmd[cmd]," type text",0);
--- 854,858 ----
          // Decode text into plain 8bit string
          char *data;
!         int len = 0;
          if(objc < 4) {
            Tcl_AppendResult(interp, "wrong # args: should be ns_imap ",sCmd[cmd]," type text",0);
***************
*** 864,868 ****
            data = (char *)rfc822_base64(data,num=len,&len);
            Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(data,(int)len));
!           fs_give((void**)&data);
            return TCL_OK;
          } else
--- 864,868 ----
            data = (char *)rfc822_base64(data,num=len,&len);
            Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(data,(int)len));
!           fs_give(&data);
            return TCL_OK;
          } else
***************
*** 871,880 ****
            data = (char *)rfc822_qprint(data,num=len,&len);
            Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(data,(int)len));
!           fs_give((void**)&data);
            return TCL_OK;
          } else
          // Convert a UTF7 an 8-bit string */
          if(!strcmp(Tcl_GetStringFromObj(objv[2],0),"utf7")) {
!           if((data = utf7_decode(data,(int)num=len,(int*)&len))) {
              Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(data,(int)len));
              ns_free(data);
--- 871,880 ----
            data = (char *)rfc822_qprint(data,num=len,&len);
            Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(data,(int)len));
!           fs_give(&data);
            return TCL_OK;
          } else
          // Convert a UTF7 an 8-bit string */
          if(!strcmp(Tcl_GetStringFromObj(objv[2],0),"utf7")) {
!           if((data = utf7_decode(data,(int)(num=len),(int*)&len))) {
              Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(data,(int)len));
              ns_free(data);
***************
*** 888,892 ****
          // Encode plain 8bit string
          char *data;
!         unsigned long len = 0;
          if(objc < 4) {
            Tcl_AppendResult(interp, "wrong # args: should be ns_imap ",sCmd[cmd]," type text",0);
--- 888,892 ----
          // Encode plain 8bit string
          char *data;
!         int len = 0;
          if(objc < 4) {
            Tcl_AppendResult(interp, "wrong # args: should be ns_imap ",sCmd[cmd]," type text",0);
***************
*** 898,902 ****
            data = (char *)rfc822_8bit(data,num=len,&len);
            Tcl_SetObjResult(interp,Tcl_NewStringObj(data,(int)len));
!           fs_give((void**)&data);
            return TCL_OK;
          } else
--- 898,902 ----
            data = (char *)rfc822_8bit(data,num=len,&len);
            Tcl_SetObjResult(interp,Tcl_NewStringObj(data,(int)len));
!           fs_give(&data);
            return TCL_OK;
          } else
***************
*** 905,914 ****
            data = (char *)rfc822_binary(data,num=len,&len);
            Tcl_SetObjResult(interp,Tcl_NewStringObj(data,(int)len));
!           fs_give((void**)&data);
            return TCL_OK;
          } else
          // Convert a 8-bit string into UTF7 */
          if(!strcmp(Tcl_GetStringFromObj(objv[2],0),"utf7")) {
!           if((data = utf7_encode(data,(int)num=len,(int*)&len))) {
              Tcl_SetObjResult(interp,Tcl_NewStringObj(data,(int)len));
              ns_free(data);
--- 905,914 ----
            data = (char *)rfc822_binary(data,num=len,&len);
            Tcl_SetObjResult(interp,Tcl_NewStringObj(data,(int)len));
!           fs_give(&data);
            return TCL_OK;
          } else
          // Convert a 8-bit string into UTF7 */
          if(!strcmp(Tcl_GetStringFromObj(objv[2],0),"utf7")) {
!           if((data = utf7_encode(data,(int)(num=len),(int*)&len))) {
              Tcl_SetObjResult(interp,Tcl_NewStringObj(data,(int)len));
              ns_free(data);
***************
*** 1213,1217 ****
               Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(text,(int)len));
          }
!         if(data) fs_give((void**)&data);
          break;
      }
--- 1213,1217 ----
               Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(text,(int)len));
          }
!         if(data) fs_give(&data);
          break;
      }
***************
*** 1412,1416 ****
            for(id = ids;*id;id++)
              Tcl_ListObjAppendElement(interp,session->list,Tcl_NewIntObj((int)*id));
!           fs_give((void**)&ids);
            Tcl_SetObjResult(interp,session->list);
          }
--- 1412,1416 ----
            for(id = ids;*id;id++)
              Tcl_ListObjAppendElement(interp,session->list,Tcl_NewIntObj((int)*id));
!           fs_give(&ids);
            Tcl_SetObjResult(interp,session->list);
          }
***************
*** 1652,1656 ****
           ns_free(session->error);
           session->error = ns_strcopy(string);
!          Ns_Log(Error,"ns_imap: [%d]: %s",session->id,string);
           break;
       }
--- 1652,1656 ----
           ns_free(session->error);
           session->error = ns_strcopy(string);
!          Ns_Log(Error,"ns_imap: [%ld]: %s",session->id,string);
           break;
       }

[naviserver-commits] modules/nsdns dns.c,1.2,1.3 dns.h,1.2,1.3 nsdns.c,1.2,1.3

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

Update of /cvsroot/naviserver/modules/nsdns
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18236/nsdns

Modified Files:
	dns.c dns.h nsdns.c 
Log Message:
compiler warnings silence


Index: nsdns.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsdns/nsdns.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nsdns.c	8 Jun 2005 20:03:42 -0000	1.2
--- nsdns.c	12 Jun 2005 22:34:22 -0000	1.3
***************
*** 84,88 ****
  {
      char *path, *address;
-     struct sockaddr_in addr;
  
      Ns_Log(Notice, "nsdns module version %s server: %s", VERSION,server);
--- 84,87 ----
***************
*** 175,183 ****
  DnsCmd(ClientData arg,Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[])
  {
      enum commands {
          cmdAdd, cmdRemove, cmdFlush, cmdList, cmdResolve, cmdQueue, cmdLookup
!     } cmd;
  
!     static char *sCmd[] = {
          "add", "del", "flush", "list", "resolve", "queue", "lookup", 0
      };
--- 174,183 ----
  DnsCmd(ClientData arg,Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[])
  {
+     int cmd;
      enum commands {
          cmdAdd, cmdRemove, cmdFlush, cmdList, cmdResolve, cmdQueue, cmdLookup
!     };
  
!     static const char *sCmd[] = {
          "add", "del", "flush", "list", "resolve", "queue", "lookup", 0
      };

Index: dns.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsdns/dns.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dns.c	8 Jun 2005 20:03:42 -0000	1.2
--- dns.c	12 Jun 2005 22:34:22 -0000	1.3
***************
*** 238,242 ****
      if(!y) return;
  
!     Ns_DStringPrintf(ds, "Name=%s, Type=%s(%d), Class=%d, TTL=%u, Length=%d, ",
                    y->name,
                    dnsTypeStr(y->type),
--- 238,242 ----
      if(!y) return;
  
!     Ns_DStringPrintf(ds, "Name=%s, Type=%s(%d), Class=%u, TTL=%lu, Length=%u, ",
                    y->name,
                    dnsTypeStr(y->type),
***************
*** 264,268 ****
       case DNS_TYPE_SOA:
           if(!y->data.soa) break;
!          Ns_DStringPrintf(ds,"MNAME=%s, RNAME=%s, SERIAL=%ul, REFRESH=%ul, RETRY=%ul, EXPIRE=%ul, TTL=%ul ",
                            y->data.soa->mname,y->data.soa->rname,y->data.soa->serial,
                            y->data.soa->refresh,y->data.soa->retry,y->data.soa->expire,
--- 264,268 ----
       case DNS_TYPE_SOA:
           if(!y->data.soa) break;
!          Ns_DStringPrintf(ds,"MNAME=%s, RNAME=%s, SERIAL=%lu, REFRESH=%lu, RETRY=%lu, EXPIRE=%lu, TTL=%lu ",
                            y->data.soa->mname,y->data.soa->rname,y->data.soa->serial,
                            y->data.soa->refresh,y->data.soa->retry,y->data.soa->expire,
***************
*** 270,274 ****
           break;
      }
!     if(y->timestamp) Ns_DStringPrintf(ds,", TIMESTAMP=%ul",y->timestamp);
  }
  
--- 270,274 ----
           break;
      }
!     if(y->timestamp) Ns_DStringPrintf(ds,", TIMESTAMP=%lu",y->timestamp);
  }
  

Index: dns.h
===================================================================
RCS file: /cvsroot/naviserver/modules/nsdns/dns.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dns.h	8 Jun 2005 20:03:42 -0000	1.2
--- dns.h	12 Jun 2005 22:34:22 -0000	1.3
***************
*** 43,46 ****
--- 43,47 ----
  #define DNS_TYPE_TXT            16
  #define DNS_TYPE_SRV            33
+ #define DNS_TYPE_NAPTR          35
  #define DNS_TYPE_ANY            255
  #define DNS_DEFAULT_TTL         (60 * 60)
***************
*** 105,108 ****
--- 106,119 ----
  } dnsName;
  
+ typedef struct _dnsNA {
+     struct _dnsNA *next;
+     short order;
+     short prefs;
+     char *flags;
+     char *service;
+     char *regexp;
+     char *replace;
+ } dnsNA;
+ 
  typedef struct _dnsRecord {
      struct _dnsRecord *next,*prev;
***************
*** 116,119 ****
--- 127,131 ----
        struct in_addr ipaddr;
        dnsMX *mx;
+       dnsNA *na;
        dnsSOA *soa;
      } data;

[naviserver-commits] naviserver ChangeLog,1.111,1.112

[Zoran V. <vas...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
See file.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** ChangeLog	11 Jun 2005 20:04:39 -0000	1.111
--- ChangeLog	12 Jun 2005 14:46:40 -0000	1.112
***************
*** 1,2 ****
--- 1,18 ----
+ 2005-06-12  Zoran Vasiljevic  <vas...@us...>
+ 
+ 	* nsd/conn.c:
+ 	* nsd/info.c:
+ 	* nsd/log.c:
+ 	* nsd/queue.c:
+ 	* nsd/tclfile.c:
+ 	* nsd/tclhttp.c:
+ 	* nsd/tclinit.c:
+ 	* nsd/tcljob.c:
+ 	* nsd/tclmisc.c:
+ 	* nsd/tclthread.c
+ 	* nsd/tclvar.c:
+ 	* nsthread/nsthreadtest.c: silencecompiler warnings like
+ 	"dereferencing type-punned pointer will break strict-aliasing rules"
+ 
  2005-06-11  Vlad Seryakov  <ser...@us...>
  

[naviserver-commits] naviserver/nsd conn.c,1.15,1.16 info.c,1.6,1.7 log.c,1.2,1.3 queue.c,1.2,1.3 tclfile.c,1.3,1.4 tclhttp.c,1.2,1.3 tclinit.c,1.6,1.7 tcljob.c,1.5,1.6 tclmisc.c,1.7,1.8 tclthread.c,1.2,1.3 tclvar.c,1.2,1.3

[Zoran V. <vas...@us...>]

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

Modified Files:
	conn.c info.c log.c queue.c tclfile.c tclhttp.c tclinit.c 
	tcljob.c tclmisc.c tclthread.c tclvar.c 
Log Message:
Silence "dereferencing type-punned pointer will break strict-aliasing rules"
types of warnings


Index: tclmisc.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclmisc.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tclmisc.c	10 Jun 2005 17:58:40 -0000	1.7
--- tclmisc.c	12 Jun 2005 14:42:44 -0000	1.8
***************
*** 430,433 ****
--- 430,434 ----
  NsTclTimeObjCmd(ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj **objv)
  {
+     int opt;
      Ns_Time result, t1, t2;
      static CONST char *opts[] = {
***************
*** 438,442 ****
  	TAdjustIdx, TDiffIdx, TGetIdx, TIncrIdx, TMakeIdx,
  	TSecondsIdx, TMicroSecondsIdx
!     } opt;
  
      if (objc < 2) {
--- 439,443 ----
  	TAdjustIdx, TDiffIdx, TGetIdx, TIncrIdx, TMakeIdx,
  	TSecondsIdx, TMicroSecondsIdx
!     };
  
      if (objc < 2) {
***************
*** 444,448 ****
      } else {
  	if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", 0,
! 				(int *) &opt) != TCL_OK) {
  	    return TCL_ERROR;
  	}
--- 445,449 ----
      } else {
  	if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", 0,
! 				&opt) != TCL_OK) {
  	    return TCL_ERROR;
  	}

Index: info.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/info.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** info.c	10 Jun 2005 17:58:39 -0000	1.6
--- info.c	12 Jun 2005 14:42:44 -0000	1.7
***************
*** 478,481 ****
--- 478,482 ----
  NsTclInfoObjCmd(ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj **objv)
  {
+     int opt;
      NsInterp *itPtr = arg;
      char *elog;
***************
*** 496,500 ****
  	sockICallbacksIdx, ITagIdx, ITclLibIdx, IThreadsIdx, IUptimeIdx,
  	IVersionIdx, IWinntIdx, IFiltersIdx, ITracesIdx, IRequestProcsIdx,
!     } opt;
  
      if (objc != 2) {
--- 497,501 ----
  	sockICallbacksIdx, ITagIdx, ITclLibIdx, IThreadsIdx, IUptimeIdx,
  	IVersionIdx, IWinntIdx, IFiltersIdx, ITracesIdx, IRequestProcsIdx,
!     };
  
      if (objc != 2) {
***************
*** 503,507 ****
      }
      if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", 0,
! 			    (int *) &opt) != TCL_OK) {
  	return TCL_ERROR;
      }
--- 504,508 ----
      }
      if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", 0,
! 			    &opt) != TCL_OK) {
  	return TCL_ERROR;
      }

Index: conn.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/conn.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** conn.c	10 Jun 2005 20:53:13 -0000	1.15
--- conn.c	12 Jun 2005 14:42:44 -0000	1.16
***************
*** 923,927 ****
      FormFile *filePtr;
      Ns_DString ds;
!     int idx, off, len;
  
      static CONST char *opts[] = {
--- 923,927 ----
      FormFile *filePtr;
      Ns_DString ds;
!     int idx, off, len, opt;
  
      static CONST char *opts[] = {
***************
*** 944,948 ****
          CServerIdx, CSockIdx, CStartIdx, CStatusIdx, CUrlIdx,
          CUrlcIdx, CUrlEncodingIdx, CUrlvIdx, CVersionIdx, CWriteEncodedIdx
!     } opt;
  
      if (objc < 2) {
--- 944,948 ----
          CServerIdx, CSockIdx, CStartIdx, CStatusIdx, CUrlIdx,
          CUrlcIdx, CUrlEncodingIdx, CUrlvIdx, CVersionIdx, CWriteEncodedIdx
!     };
  
      if (objc < 2) {
***************
*** 951,955 ****
      }
      if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", 0,
!                             (int *) &opt) != TCL_OK) {
          return TCL_ERROR;
      }
--- 951,955 ----
      }
      if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", 0,
!                             &opt) != TCL_OK) {
          return TCL_ERROR;
      }

Index: tcljob.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tcljob.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcljob.c	10 Jun 2005 20:53:13 -0000	1.5
--- tcljob.c	12 Jun 2005 14:42:44 -0000	1.6
***************
*** 358,362 ****
      Queue               *queuePtr = NULL;
      Job                 *jobPtr = NULL, **nextPtrPtr;
!     int                 code, new, create = 0, max;
      char                *jobId = NULL, buf[100], *queueId;
      Tcl_HashEntry       *hPtr, *jPtr;
--- 358,362 ----
      Queue               *queuePtr = NULL;
      Job                 *jobPtr = NULL, **nextPtrPtr;
!     int                 code, new, create = 0, max, opt;
      char                *jobId = NULL, buf[100], *queueId;
      Tcl_HashEntry       *hPtr, *jPtr;
***************
*** 373,377 ****
          JCancelIdx, JCreateIdx, JDeleteIdx, JGenIDIdx, JJobsIdx, JJobsListIdx,
          JThreadListIdx, JQueueIdx, JQueuesIdx, JQueueListIdx, JWaitIdx, JWaitAnyIdx
!     } opt;
  
      if (objc < 2) {
--- 373,377 ----
          JCancelIdx, JCreateIdx, JDeleteIdx, JGenIDIdx, JJobsIdx, JJobsListIdx,
          JThreadListIdx, JQueueIdx, JQueuesIdx, JQueueListIdx, JWaitIdx, JWaitAnyIdx
!     };
  
      if (objc < 2) {
***************
*** 380,384 ****
      }
      if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", TCL_EXACT,
!                             (int *) &opt) != TCL_OK) {
          return TCL_ERROR;
      }
--- 380,384 ----
      }
      if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", TCL_EXACT,
!                             &opt) != TCL_OK) {
          return TCL_ERROR;
      }

Index: tclthread.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclthread.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tclthread.c	10 Jun 2005 17:58:41 -0000	1.2
--- tclthread.c	12 Jun 2005 14:42:44 -0000	1.3
***************
*** 120,123 ****
--- 120,125 ----
  NsTclMutexObjCmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj **objv)
  {
+     int opt;
+     void *lockArg;
      Ns_Mutex *lockPtr;
      static CONST char *opts[] = {
***************
*** 126,135 ****
      enum {
  	MCreateIdx, MDestroyIdx, MLockIdx, MUnlockIdx
!     } opt;
  
      if (!GetArgs(interp, objc, objv, opts, 'm', MCreateIdx,
! 		  (int *) &opt, (void **) &lockPtr)) {
  	return TCL_ERROR;
      }
      switch (opt) {
      case MCreateIdx:
--- 128,138 ----
      enum {
  	MCreateIdx, MDestroyIdx, MLockIdx, MUnlockIdx
!     };
  
      if (!GetArgs(interp, objc, objv, opts, 'm', MCreateIdx,
! 		 &opt, &lockArg)) {
  	return TCL_ERROR;
      }
+     lockPtr = (Ns_Mutex*)lockArg;
      switch (opt) {
      case MCreateIdx:
***************
*** 174,177 ****
--- 177,182 ----
  		   Tcl_Obj **objv)
  {
+     int opt;
+     void *csArg;
      Ns_Cs *csPtr;
      static CONST char *opts[] = {
***************
*** 180,189 ****
      enum {
  	CCreateIdx, CDestroyIdx, CEnterIdx, CLeaveIdx
!     } opt;
! 
      if (!GetArgs(interp, objc, objv, opts, 'c', CCreateIdx,
! 		  (int *) &opt, (void **) &csPtr)) {
  	return TCL_ERROR;
      }
      switch (opt) {
      case CCreateIdx:
--- 185,194 ----
      enum {
  	CCreateIdx, CDestroyIdx, CEnterIdx, CLeaveIdx
!     };
      if (!GetArgs(interp, objc, objv, opts, 'c', CCreateIdx,
! 		 &opt, &csArg)) {
  	return TCL_ERROR;
      }
+     csPtr = (Ns_Cs*)csArg;
      switch (opt) {
      case CCreateIdx:
***************
*** 226,230 ****
  {
      Ns_Sema *semaPtr;
!     int      cnt;
      static CONST char *opts[] = {
  	"create", "destroy", "release", "wait", NULL
--- 231,236 ----
  {
      Ns_Sema *semaPtr;
!     int opt, cnt;
!     void *semaArg;
      static CONST char *opts[] = {
  	"create", "destroy", "release", "wait", NULL
***************
*** 232,241 ****
      enum {
  	SCreateIdx, SDestroyIdx, SReleaseIdx, SWaitIdx
!     } opt;
  
      if (!GetArgs(interp, objc, objv, opts, 's', SCreateIdx,
! 		  (int *) &opt, (void **) &semaPtr)) {
  	return TCL_ERROR;
      }
      switch (opt) {
      case SCreateIdx:
--- 238,248 ----
      enum {
  	SCreateIdx, SDestroyIdx, SReleaseIdx, SWaitIdx
!     };
  
      if (!GetArgs(interp, objc, objv, opts, 's', SCreateIdx,
! 		 &opt, &semaArg)) {
  	return TCL_ERROR;
      }
+     semaPtr = (Ns_Sema*)semaArg;
      switch (opt) {
      case SCreateIdx:
***************
*** 290,295 ****
      Ns_Cond *condPtr;
      Ns_Mutex *lock;
!     Ns_Time   timeout;
!     int       result;
      static CONST char *opts[] = {
  	"abswait", "broadcast", "create", "destroy", "set",
--- 297,304 ----
      Ns_Cond *condPtr;
      Ns_Mutex *lock;
!     void *lockArg;
!     void *condArg;
!     Ns_Time timeout;
!     int opt, result;
      static CONST char *opts[] = {
  	"abswait", "broadcast", "create", "destroy", "set",
***************
*** 299,308 ****
  	EAbsWaitIdx, EBroadcastIdx, ECreateIdx, EDestroyIdx, ESetIdx,
  	ESignalIdx, ETimedWaitIdx, EWaitIdx
!     } opt;
  
      if (!GetArgs(interp, objc, objv, opts, 'e', ECreateIdx,
! 		  (int *) &opt, (void **) &condPtr)) {
  	return TCL_ERROR;
      }
      switch (opt) {
      case ECreateIdx:
--- 308,318 ----
  	EAbsWaitIdx, EBroadcastIdx, ECreateIdx, EDestroyIdx, ESetIdx,
  	ESignalIdx, ETimedWaitIdx, EWaitIdx
!     };
  
      if (!GetArgs(interp, objc, objv, opts, 'e', ECreateIdx,
! 		 &opt, &condArg)) {
  	return TCL_ERROR;
      }
+     condPtr = (Ns_Cond*)condArg;
      switch (opt) {
      case ECreateIdx:
***************
*** 316,322 ****
              return TCL_ERROR;
          }
! 	if (GetAddr(interp, 'm', Tcl_GetString(objv[3]), (void **) &lock) != TCL_OK) {
              return TCL_ERROR;
          }
          if (objc < 5) {
              timeout.sec = timeout.usec = 0;
--- 326,333 ----
              return TCL_ERROR;
          }
! 	if (GetAddr(interp, 'm', Tcl_GetString(objv[3]), &lockArg) != TCL_OK) {
              return TCL_ERROR;
          }
+         lock = (Ns_Mutex*)lockArg;
          if (objc < 5) {
              timeout.sec = timeout.usec = 0;
***************
*** 388,391 ****
--- 399,404 ----
  		  Tcl_Obj **objv)
  {
+     int opt;
+     void *rwlockArg;
      Ns_RWLock *rwlockPtr;
      static CONST char *opts[] = {
***************
*** 396,405 ****
  	RCreateIdx, RDestroyIdx, RReadLockIdx, RReadUnlockIdx,
  	RWriteLockIdx, RWriteUnlockIdx, RUnlockIdx
!     } opt;
  
      if (!GetArgs(interp, objc, objv, opts, 'r', RCreateIdx,
! 		  (int *) &opt, (void **) &rwlockPtr)) {
  	return TCL_ERROR;
      }
      switch (opt) {
      case RCreateIdx:
--- 409,419 ----
  	RCreateIdx, RDestroyIdx, RReadLockIdx, RReadUnlockIdx,
  	RWriteLockIdx, RWriteUnlockIdx, RUnlockIdx
!     };
  
      if (!GetArgs(interp, objc, objv, opts, 'r', RCreateIdx,
! 		 &opt, &rwlockArg)) {
  	return TCL_ERROR;
      }
+     rwlockPtr = (Ns_RWLock*)rwlockArg;
      switch (opt) {
      case RCreateIdx:
***************
*** 469,472 ****
--- 483,487 ----
          }
      } else if (STREQ(argv[1], "wait") || STREQ(argv[1], "join")) {
+         void *tidArg;
          if (argc < 3) {
              Tcl_AppendResult(interp, "wrong # args: should be \"",
***************
*** 474,481 ****
              return TCL_ERROR;
          }
!         if (GetAddr(interp, 't', argv[2], (void **) &tid) 
  	    != TCL_OK) {
              return TCL_ERROR;
          }
  	Ns_ThreadJoin(&tid, &status);
  	Tcl_SetResult(interp, (char *) status, (Tcl_FreeProc *) ns_free);
--- 489,497 ----
              return TCL_ERROR;
          }
!         if (GetAddr(interp, 't', argv[2], &tidArg) 
  	    != TCL_OK) {
              return TCL_ERROR;
          }
+         tid = (Ns_Thread)tidArg;
  	Ns_ThreadJoin(&tid, &status);
  	Tcl_SetResult(interp, (char *) status, (Tcl_FreeProc *) ns_free);

Index: tclhttp.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclhttp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tclhttp.c	10 Jun 2005 17:58:40 -0000	1.2
--- tclhttp.c	12 Jun 2005 14:42:44 -0000	1.3
***************
*** 102,106 ****
      Http *httpPtr;
      char buf[50], *result, *carg;
!     int new, status, n, timeidx;
      Ns_Time timeout, incr;
      Ns_Set *hdrs;
--- 102,106 ----
      Http *httpPtr;
      char buf[50], *result, *carg;
!     int new, status, n, timeidx, opt;
      Ns_Time timeout, incr;
      Ns_Set *hdrs;
***************
*** 112,116 ****
      enum {
          HCancelIdx, HCleanupIdx, HQueueIdx, HWaitIdx
!     } opt;
  
      char *method, *url, *body;
--- 112,116 ----
      enum {
          HCancelIdx, HCleanupIdx, HQueueIdx, HWaitIdx
!     };
  
      char *method, *url, *body;
***************
*** 121,125 ****
      }
      if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", 0,
!                             (int *) &opt) != TCL_OK) {
          return TCL_ERROR;
      }
--- 121,125 ----
      }
      if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", 0,
!                             &opt) != TCL_OK) {
          return TCL_ERROR;
      }

Index: log.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/log.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** log.c	10 Jun 2005 17:58:39 -0000	1.2
--- log.c	12 Jun 2005 14:42:44 -0000	1.3
***************
*** 337,341 ****
  	       Tcl_Obj *CONST objv[])
  {
!     int len;
      Cache *cachePtr;
      static CONST char *opts[] = {
--- 337,341 ----
  	       Tcl_Obj *CONST objv[])
  {
!     int len, opt;
      Cache *cachePtr;
      static CONST char *opts[] = {
***************
*** 357,361 ****
  	CReleaseIdx,
  	CTruncIdx
!     } opt;
  
      if (objc < 2) {
--- 357,361 ----
  	CReleaseIdx,
  	CTruncIdx
!     };
  
      if (objc < 2) {
***************
*** 364,368 ****
      }
      if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", 0,
! 			    (int *) &opt) != TCL_OK) {
  	return TCL_ERROR;
      }
--- 364,368 ----
      }
      if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", 0,
! 			    &opt) != TCL_OK) {
  	return TCL_ERROR;
      }

Index: tclinit.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclinit.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tclinit.c	10 Jun 2005 20:53:13 -0000	1.6
--- tclinit.c	12 Jun 2005 14:42:44 -0000	1.7
***************
*** 918,925 ****
  	ISaveIdx, IUpdateIdx, IOnCreateIdx, IOnCleanupIdx, IOnInitIdx,
          IOnDeleteIdx
!     } opt;
      char *script;
      int length, result;
!     int status;
  
      if (objc < 2) {
--- 918,925 ----
  	ISaveIdx, IUpdateIdx, IOnCreateIdx, IOnCleanupIdx, IOnInitIdx,
          IOnDeleteIdx
!     };
      char *script;
      int length, result;
!     int status,opt;
  
      if (objc < 2) {
***************
*** 928,932 ****
      }
      if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", 0,
! 			    (int *) &opt) != TCL_OK) {
  	return TCL_ERROR;
      }
--- 928,932 ----
      }
      if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", 0,
! 			    &opt) != TCL_OK) {
  	return TCL_ERROR;
      }

Index: queue.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/queue.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** queue.c	10 Jun 2005 17:58:39 -0000	1.2
--- queue.c	12 Jun 2005 14:42:44 -0000	1.3
***************
*** 280,283 ****
--- 280,284 ----
  		  Tcl_Obj **objv)
  {
+     int opt;
      NsInterp *itPtr = arg;
      NsServer *servPtr = itPtr->servPtr;
***************
*** 292,296 ****
  	 SActiveIdx, SAllIdx, SConnectionsIdx, SKeepaliveIdx, SPoolsIdx,
  	 SQueuedIdx, SThreadsIdx, SWaitingIdx,
!     } opt;
  
      if (objc != 2 && objc != 3) {
--- 293,297 ----
  	 SActiveIdx, SAllIdx, SConnectionsIdx, SKeepaliveIdx, SPoolsIdx,
  	 SQueuedIdx, SThreadsIdx, SWaitingIdx,
!     };
  
      if (objc != 2 && objc != 3) {
***************
*** 299,303 ****
      }
      if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", 0,
! 			    (int *) &opt) != TCL_OK) {
  	return TCL_ERROR;
      }
--- 300,304 ----
      }
      if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", 0,
! 			    &opt) != TCL_OK) {
  	return TCL_ERROR;
      }
***************
*** 925,931 ****
  JoinConnThread(Ns_Thread *threadPtr)
  {
      Arg *argPtr;
  
!     Ns_ThreadJoin(threadPtr, (void **) &argPtr);
      ns_free(argPtr);
  }
--- 926,934 ----
  JoinConnThread(Ns_Thread *threadPtr)
  {
+     void *argArg;
      Arg *argPtr;
  
!     Ns_ThreadJoin(threadPtr, &argArg);
!     argPtr = (Arg*)argArg;
      ns_free(argPtr);
  }

Index: tclvar.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclvar.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tclvar.c	10 Jun 2005 17:58:41 -0000	1.2
--- tclvar.c	12 Jun 2005 14:42:44 -0000	1.3
***************
*** 383,387 ****
      Tcl_HashSearch search;
      char *pattern, *key;
!     int i, lobjc, size;
      Tcl_Obj *result, **lobjv;
  
--- 383,387 ----
      Tcl_HashSearch search;
      char *pattern, *key;
!     int i, opt, lobjc, size;
      Tcl_Obj *result, **lobjv;
  
***************
*** 391,395 ****
      enum ISubCmdIdx {
  	CSetIdx, CResetIdx, CGetIdx, CNamesIdx, CSizeIdx, CExistsIdx
!     } opt;
  
      if (objc < 2) {
--- 391,395 ----
      enum ISubCmdIdx {
  	CSetIdx, CResetIdx, CGetIdx, CNamesIdx, CSizeIdx, CExistsIdx
!     };
  
      if (objc < 2) {
***************
*** 398,402 ****
      }
      if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", 0,
! 			    (int *) &opt) != TCL_OK) {
  	return TCL_ERROR;
      }
--- 398,402 ----
      }
      if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", 0,
! 			    &opt) != TCL_OK) {
  	return TCL_ERROR;
      }
***************
*** 771,775 ****
      Tcl_HashEntry        *hPtr;
      Tcl_HashSearch        search;
!     int                   new, code;
      char *var = NULL, *val = NULL;
      static CONST char *opts[] = {
--- 771,775 ----
      Tcl_HashEntry        *hPtr;
      Tcl_HashSearch        search;
!     int                   new, code, opt;
      char *var = NULL, *val = NULL;
      static CONST char *opts[] = {
***************
*** 778,782 ****
      enum {
  	VExistsIdx, VGetIdx, VListIdx, VSetIdx, VUnsetIdx
!     } opt; 
  
      if (objc < 2) {
--- 778,782 ----
      enum {
  	VExistsIdx, VGetIdx, VListIdx, VSetIdx, VUnsetIdx
!     }; 
  
      if (objc < 2) {
***************
*** 785,789 ****
      }
      if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", 0,
! 			    (int *) &opt) != TCL_OK) {
  	return TCL_ERROR;
      }
--- 785,789 ----
      }
      if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", 0,
! 			    &opt) != TCL_OK) {
  	return TCL_ERROR;
      }

Index: tclfile.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclfile.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tclfile.c	10 Jun 2005 17:58:40 -0000	1.3
--- tclfile.c	12 Jun 2005 14:42:44 -0000	1.4
***************
*** 1029,1033 ****
      char *name, *chanName;
      NsRegChan *regChan = NULL;
!     int new, shared;
      Tcl_HashTable *tabPtr;
      Tcl_HashEntry *hPtr;
--- 1029,1033 ----
      char *name, *chanName;
      NsRegChan *regChan = NULL;
!     int new, shared, opt;
      Tcl_HashTable *tabPtr;
      Tcl_HashEntry *hPtr;
***************
*** 1038,1042 ****
      enum {
  	CCleanupIdx, CListIdx, CCreateIdx, CPutIdx, CGetIdx
!     } opt;
  
      if (objc < 2) {
--- 1038,1042 ----
      enum {
  	CCleanupIdx, CListIdx, CCreateIdx, CPutIdx, CGetIdx
!     };
  
      if (objc < 2) {
***************
*** 1045,1049 ****
      }
      if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", 0,
! 		(int *) &opt) != TCL_OK) {
  	return TCL_ERROR;
      }
--- 1045,1049 ----
      }
      if (Tcl_GetIndexFromObj(interp, objv[1], opts, "option", 0,
! 		            &opt) != TCL_OK) {
  	return TCL_ERROR;
      }

[naviserver-commits] naviserver/nsthread nsthreadtest.c,1.3,1.4

[Zoran V. <vas...@us...>]

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

Modified Files:
	nsthreadtest.c 
Log Message:
Silence "dereferencing type-punned pointer will break strict-aliasing rules"
types of warnings


Index: nsthreadtest.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsthread/nsthreadtest.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** nsthreadtest.c	10 Jun 2005 17:58:59 -0000	1.3
--- nsthreadtest.c	12 Jun 2005 14:42:44 -0000	1.4
***************
*** 464,469 ****
      Msg("rwlock write unlocked (main thread)");
      for (i = 0; i < 10; ++i) {
  	Msg("waiting for thread %d to exit", i);
! 	Ns_ThreadJoin(&threads[i], (void **) &code);
  	Msg("thread %d exited - code: %d", i, code);
      }
--- 464,471 ----
      Msg("rwlock write unlocked (main thread)");
      for (i = 0; i < 10; ++i) {
+         void *codeArg;
  	Msg("waiting for thread %d to exit", i);
! 	Ns_ThreadJoin(&threads[i], &codeArg);
!         code = (int)codeArg;
  	Msg("thread %d exited - code: %d", i, code);
      }

[naviserver-commits] naviserver ChangeLog,1.110,1.111

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

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

Modified Files:
	ChangeLog 
Log Message:
removed CVS's <<<< symbols


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** ChangeLog	11 Jun 2005 20:04:11 -0000	1.110
--- ChangeLog	11 Jun 2005 20:04:39 -0000	1.111
***************
*** 13,17 ****
  	* nsd/nslog.c: Say NULL rather than 0 when talking about null pointers.
  
- >>>>>>> 1.109
  2005-06-11  Zoran Vasiljevic  <vas...@us...>
  
--- 13,16 ----

[naviserver-commits] naviserver/nsd return.c,1.4,1.5

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

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

Modified Files:
	return.c 
Log Message:
got rid of another compiler warning


Index: return.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/return.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** return.c	10 Jun 2005 17:58:39 -0000	1.4
--- return.c	11 Jun 2005 20:04:11 -0000	1.5
***************
*** 259,264 ****
  	    connPtr->request != NULL &&
  	    (( (connPtr->responseStatus >= 200 && connPtr->responseStatus < 300) &&
! 	    (lengthHdr != NULL &&
! 	    connPtr->responseLength == length) || doChunkEncoding) ||
  	    (connPtr->responseStatus == 304 || connPtr->responseStatus == 201 || connPtr->responseStatus == 207) ) &&
  	    (nsconf.keepalive.allmethods == NS_TRUE ||
--- 259,264 ----
  	    connPtr->request != NULL &&
  	    (( (connPtr->responseStatus >= 200 && connPtr->responseStatus < 300) &&
! 	    ((lengthHdr != NULL &&
! 	     connPtr->responseLength == length) || doChunkEncoding)) ||
  	    (connPtr->responseStatus == 304 || connPtr->responseStatus == 201 || connPtr->responseStatus == 207) ) &&
  	    (nsconf.keepalive.allmethods == NS_TRUE ||

[naviserver-commits] naviserver ChangeLog,1.109,1.110

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

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

Modified Files:
	ChangeLog 
Log Message:
got rid of another compiler warning


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** ChangeLog	11 Jun 2005 20:00:47 -0000	1.109
--- ChangeLog	11 Jun 2005 20:04:11 -0000	1.110
***************
*** 1,2 ****
--- 1,6 ----
+ 2005-06-11  Vlad Seryakov  <ser...@us...>
+ 
+ 	nsd/return.c: made warning go away about parentheses around && and ||
+ 
  2005-06-11  Stephen Deasey  <sd...@us...>
  
***************
*** 9,12 ****
--- 13,17 ----
  	* nsd/nslog.c: Say NULL rather than 0 when talking about null pointers.
  
+ >>>>>>> 1.109
  2005-06-11  Zoran Vasiljevic  <vas...@us...>
  

[naviserver-commits] naviserver/nslog nslog.c,1.7,1.8

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

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

Modified Files:
	nslog.c 
Log Message:
        * include/nscheck: Add new attribute NS_GNUC_SENTINEL which
        ensures that a NULL is passed as the last arg to a varargs
        function.  Also, make sure that the format arg in a printf-like
        function is non-NULL.
        * include/ns.h: Markup up with NS_GNUC_SENTINEL.
        * nsd/urlspace.c:
        * nsd/nslog.c: Say NULL rather than 0 when talking about null pointers.


Index: nslog.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nslog/nslog.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** nslog.c	10 Jun 2005 20:53:13 -0000	1.7
--- nslog.c	11 Jun 2005 20:00:48 -0000	1.8
***************
*** 253,257 ****
      /* Parse extended headers, it is just Tcl list of names */
      Ns_DStringTrunc(&ds,0);
!     Ns_DStringVarAppend(&ds,Ns_ConfigGet(path,"extendedheaders"),0);
      if (Tcl_SplitList(NULL,ds.string,&opt,&logPtr->extheaders) != TCL_OK) {
          Ns_Log(Error,"nslog: invalid %s/extendedHeaders parameter: %s",path,ds.string);
--- 253,257 ----
      /* Parse extended headers, it is just Tcl list of names */
      Ns_DStringTrunc(&ds,0);
!     Ns_DStringVarAppend(&ds, Ns_ConfigGet(path, "extendedheaders"), NULL);
      if (Tcl_SplitList(NULL,ds.string,&opt,&logPtr->extheaders) != TCL_OK) {
          Ns_Log(Error,"nslog: invalid %s/extendedHeaders parameter: %s",path,ds.string);

[naviserver-commits] naviserver/nsd urlspace.c,1.3,1.4

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

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

Modified Files:
	urlspace.c 
Log Message:
        * include/nscheck: Add new attribute NS_GNUC_SENTINEL which
        ensures that a NULL is passed as the last arg to a varargs
        function.  Also, make sure that the format arg in a printf-like
        function is non-NULL.
        * include/ns.h: Markup up with NS_GNUC_SENTINEL.
        * nsd/urlspace.c:
        * nsd/nslog.c: Say NULL rather than 0 when talking about null pointers.


Index: urlspace.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/urlspace.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** urlspace.c	10 Jun 2005 17:58:41 -0000	1.3
--- urlspace.c	11 Jun 2005 20:00:48 -0000	1.4
***************
*** 2160,2168 ****
                           break;
                       default:
!                          Ns_DStringVarAppend(dsPtr, "/", stack[depth], 0);
                           break;
                      }
                  }
!                 Ns_DStringVarAppend(dsPtr, filter, " ", 0);
                  if (nodePtr->dataInherit != NULL) {
                      func(dsPtr, nodePtr->dataInherit);
--- 2160,2168 ----
                           break;
                       default:
!                          Ns_DStringVarAppend(dsPtr, "/", stack[depth], NULL);
                           break;
                      }
                  }
!                 Ns_DStringVarAppend(dsPtr, filter, " ", NULL);
                  if (nodePtr->dataInherit != NULL) {
                      func(dsPtr, nodePtr->dataInherit);

[naviserver-commits] naviserver/include ns.h,1.24,1.25 nscheck.h,1.1,1.2

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

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

Modified Files:
	ns.h nscheck.h 
Log Message:
        * include/nscheck: Add new attribute NS_GNUC_SENTINEL which
        ensures that a NULL is passed as the last arg to a varargs
        function.  Also, make sure that the format arg in a printf-like
        function is non-NULL.
        * include/ns.h: Markup up with NS_GNUC_SENTINEL.
        * nsd/urlspace.c:
        * nsd/nslog.c: Say NULL rather than 0 when talking about null pointers.


Index: nscheck.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/nscheck.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** nscheck.h	10 Jun 2005 07:29:19 -0000	1.1
--- nscheck.h	11 Jun 2005 20:00:48 -0000	1.2
***************
*** 47,80 ****
  
  
! #if __GNUC_PREREQ(2,96)
! # define NS_GNUC_MALLOC __attribute__((__malloc__))
! # define NS_GNUC_PURE __attribute__((__pure__))
! # define NS_GNUC_CONST __attribute__((__const__))
  #else
! # define NS_GNUC_MALLOC
! # define NS_GNUC_PURE
! # define NS_GNUC_CONST
  #endif
  
  
! #if __GNUC_PREREQ(2,7)
! # define NS_GNUC_UNUSED __attribute__((__unused__))
! # define NS_GNUC_NORETURN __attribute__((__noreturn__))
! # define NS_GNUC_PRINTF(fmtarg, firstvararg) \
!              __attribute__((__format__ (__printf__, fmtarg, firstvararg)))
! # define NS_GNUC_SCANF(fmtarg, firstvararg) \
!              __attribute__((__format__ (__scanf__, fmtarg, firstvararg)))
  #else
! # define NS_GNUC_UNUSED
! # define NS_GNUC_NORETURN
! # define NS_GNUC_PRINTF(fmtarg, firstvararg)
! # define NS_GNUC_SCANF(fmtarg, firstvararg)
  #endif
  
  
! #if __GNUC_PREREQ(2,8)
! # define NS_GNUC_FORMAT(fmtarg) __attribute__((__format_arg__ (fmtarg)))
  #else
! # define NS_GNUC_FORMAT(fmtarg)
  #endif
  
--- 47,72 ----
  
  
! #if __GNUC_PREREQ(3,5)
! # define NS_GNUC_SENTINEL __attribute__((__sentinel__))
  #else
! # define NS_GNUC_SENTINEL
  #endif
  
  
! #if __GNUC_PREREQ(3,3)
! # define NS_GNUC_NONNULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
! # define NS_GNUC_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
! # define NS_GNUC_MAYALIAS __attribute__((__may_alias__))
  #else
! # define NS_GNUC_NONNULL(...)
! # define NS_GNUC_WARN_UNUSED_RESULT
! # define NS_GNUC_MAYALIAS
  #endif
  
  
! #if __GNUC_PREREQ(3,2)
! # define NS_GNUC_DEPRECATED __attribute__((__deprecated__))
  #else
! # define NS_GNUC_DEPRECATED
  #endif
  
***************
*** 87,105 ****
  
  
! #if __GNUC_PREREQ(3,2)
! # define NS_GNUC_DEPRECATED __attribute__((__deprecated__))
  #else
! # define NS_GNUC_DEPRECATED
  #endif
  
  
! #if __GNUC_PREREQ(3,3)
! # define NS_GNUC_NONNULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
! # define NS_GNUC_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
! # define NS_GNUC_MAYALIAS __attribute__((__may_alias__))
  #else
! # define NS_GNUC_NONNULL(...)
! # define NS_GNUC_WARN_UNUSED_RESULT
! # define NS_GNUC_MAYALIAS
  #endif
  
--- 79,110 ----
  
  
! #if __GNUC_PREREQ(2,8)
! # define NS_GNUC_FORMAT(m) __attribute__((__format_arg__ (m)))
  #else
! # define NS_GNUC_FORMAT(m)
  #endif
  
  
! #if __GNUC_PREREQ(2,7)
! # define NS_GNUC_UNUSED __attribute__((__unused__))
! # define NS_GNUC_NORETURN __attribute__((__noreturn__))
! # define NS_GNUC_PRINTF(m, n) __attribute__((__format__ (__printf__, m, n))) NS_GNUC_NONNULL(m)
! # define NS_GNUC_SCANF(m, n) __attribute__((__format__ (__scanf__, m, n))) NS_GNUC_NONNULL(m)
  #else
! # define NS_GNUC_UNUSED
! # define NS_GNUC_NORETURN
! # define NS_GNUC_PRINTF(fmtarg, firstvararg)
! # define NS_GNUC_SCANF(fmtarg, firstvararg)
! #endif
! 
! 
! #if __GNUC_PREREQ(2,96)
! # define NS_GNUC_MALLOC __attribute__((__malloc__))
! # define NS_GNUC_PURE __attribute__((__pure__))
! # define NS_GNUC_CONST __attribute__((__const__))
! #else
! # define NS_GNUC_MALLOC
! # define NS_GNUC_PURE
! # define NS_GNUC_CONST
  #endif
  

Index: ns.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/ns.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ns.h	10 Jun 2005 20:53:12 -0000	1.24
--- ns.h	11 Jun 2005 20:00:48 -0000	1.25
***************
*** 583,587 ****
  NS_EXTERN int Ns_ConfigGetInt64(char *section, char *key, ns_int64 *valuePtr);
  NS_EXTERN int Ns_ConfigGetBool(char *section, char *key, int *valuePtr);
! NS_EXTERN char *Ns_ConfigGetPath(char *server, char *module, ...);
  NS_EXTERN Ns_Set **Ns_ConfigGetSections(void);
  NS_EXTERN Ns_Set *Ns_ConfigGetSection(char *section);
--- 583,587 ----
  NS_EXTERN int Ns_ConfigGetInt64(char *section, char *key, ns_int64 *valuePtr);
  NS_EXTERN int Ns_ConfigGetBool(char *section, char *key, int *valuePtr);
! NS_EXTERN char *Ns_ConfigGetPath(char *server, char *module, ...) NS_GNUC_SENTINEL;
  NS_EXTERN Ns_Set **Ns_ConfigGetSections(void);
  NS_EXTERN Ns_Set *Ns_ConfigGetSection(char *section);
***************
*** 686,693 ****
  
  NS_EXTERN char **Ns_DStringAppendArgv(Ns_DString *dsPtr);
! NS_EXTERN char *Ns_DStringVarAppend(Ns_DString *dsPtr, ...);
  NS_EXTERN char *Ns_DStringExport(Ns_DString *dsPtr);
! NS_EXTERN char *Ns_DStringPrintf(Ns_DString *dsPtr, char *fmt, ...)
!      NS_GNUC_PRINTF(2, 3);
  NS_EXTERN char *Ns_DStringVPrintf(Ns_DString *dsPtr, char *fmt, va_list ap);
  NS_EXTERN char *Ns_DStringAppendArg(Ns_DString *dsPtr, char *string);
--- 686,692 ----
  
  NS_EXTERN char **Ns_DStringAppendArgv(Ns_DString *dsPtr);
! NS_EXTERN char *Ns_DStringVarAppend(Ns_DString *dsPtr, ...) NS_GNUC_SENTINEL;
  NS_EXTERN char *Ns_DStringExport(Ns_DString *dsPtr);
! NS_EXTERN char *Ns_DStringPrintf(Ns_DString *dsPtr, char *fmt, ...) NS_GNUC_PRINTF(2,3);
  NS_EXTERN char *Ns_DStringVPrintf(Ns_DString *dsPtr, char *fmt, va_list ap);
  NS_EXTERN char *Ns_DStringAppendArg(Ns_DString *dsPtr, char *string);
***************
*** 966,977 ****
  NS_EXTERN int Ns_PathIsAbsolute(CONST char *path);
  NS_EXTERN char *Ns_NormalizePath(Ns_DString *dsPtr, CONST char *path);
! NS_EXTERN char *Ns_MakePath(Ns_DString *dsPtr, ...);
  NS_EXTERN char *Ns_HashPath(Ns_DString *dsPtr, CONST char *string, int levels);
! NS_EXTERN char *Ns_LibPath(Ns_DString *dsPtr, ...);
! NS_EXTERN char *Ns_HomePath(Ns_DString *dsPtr, ...);
  NS_EXTERN char *Ns_ModulePath(Ns_DString *dsPtr, CONST char *server,
!                               CONST char *module, ...);
! NS_EXTERN char *Ns_ServerPath(Ns_DString *dest, CONST char *server, ...);
! NS_EXTERN char *Ns_PagePath(Ns_DString *dest, CONST char *server, ...);
  NS_EXTERN int Ns_SetServerRootProc(Ns_ServerRootProc *proc, void *arg);
  
--- 965,976 ----
  NS_EXTERN int Ns_PathIsAbsolute(CONST char *path);
  NS_EXTERN char *Ns_NormalizePath(Ns_DString *dsPtr, CONST char *path);
! NS_EXTERN char *Ns_MakePath(Ns_DString *dsPtr, ...) NS_GNUC_SENTINEL;
  NS_EXTERN char *Ns_HashPath(Ns_DString *dsPtr, CONST char *string, int levels);
! NS_EXTERN char *Ns_LibPath(Ns_DString *dsPtr, ...) NS_GNUC_SENTINEL;
! NS_EXTERN char *Ns_HomePath(Ns_DString *dsPtr, ...) NS_GNUC_SENTINEL;
  NS_EXTERN char *Ns_ModulePath(Ns_DString *dsPtr, CONST char *server,
!                               CONST char *module, ...) NS_GNUC_SENTINEL;
! NS_EXTERN char *Ns_ServerPath(Ns_DString *dest, CONST char *server, ...) NS_GNUC_SENTINEL;
! NS_EXTERN char *Ns_PagePath(Ns_DString *dest, CONST char *server, ...) NS_GNUC_SENTINEL;
  NS_EXTERN int Ns_SetServerRootProc(Ns_ServerRootProc *proc, void *arg);
  
***************
*** 1192,1196 ****
                                                 Tcl_Obj *argObjPtr);
  NS_EXTERN int Ns_TclEvalCallback(Tcl_Interp *interp, Ns_TclCallback *cbPtr,
!                                  Ns_DString *result, ...);
  NS_EXTERN Ns_Callback Ns_TclCallbackProc;
  NS_EXTERN Ns_Callback Ns_TclFreeCallback;
--- 1191,1195 ----
                                                 Tcl_Obj *argObjPtr);
  NS_EXTERN int Ns_TclEvalCallback(Tcl_Interp *interp, Ns_TclCallback *cbPtr,
!                                  Ns_DString *result, ...) NS_GNUC_SENTINEL;
  NS_EXTERN Ns_Callback Ns_TclCallbackProc;
  NS_EXTERN Ns_Callback Ns_TclFreeCallback;

[naviserver-commits] naviserver ChangeLog,1.108,1.109

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

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

Modified Files:
	ChangeLog 
Log Message:
        * include/nscheck: Add new attribute NS_GNUC_SENTINEL which
        ensures that a NULL is passed as the last arg to a varargs
        function.  Also, make sure that the format arg in a printf-like
        function is non-NULL.
        * include/ns.h: Markup up with NS_GNUC_SENTINEL.
        * nsd/urlspace.c:
        * nsd/nslog.c: Say NULL rather than 0 when talking about null pointers.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** ChangeLog	11 Jun 2005 18:44:27 -0000	1.108
--- ChangeLog	11 Jun 2005 20:00:47 -0000	1.109
***************
*** 1,2 ****
--- 1,12 ----
+ 2005-06-11  Stephen Deasey  <sd...@us...>
+ 
+ 	* include/nscheck: Add new attribute NS_GNUC_SENTINEL which
+ 	ensures that a NULL is passed as the last arg to a varargs
+ 	function.  Also, make sure that the format arg in a printf-like
+ 	function is non-NULL.
+ 	* include/ns.h: Markup up with NS_GNUC_SENTINEL.
+ 	* nsd/urlspace.c:
+ 	* nsd/nslog.c: Say NULL rather than 0 when talking about null pointers.
+ 
  2005-06-11  Zoran Vasiljevic  <vas...@us...>
  

[naviserver-commits] naviserver/include nsconfig.h.in,NONE,1.1 nsthread.h,1.6,1.7 config.h.in,1.3,NONE

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

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

Modified Files:
	nsthread.h 
Added Files:
	nsconfig.h.in 
Removed Files:
	config.h.in 
Log Message:
        * configure.in:
        * include/config.h.in:
        * include/nsthread.h:
        * include/nsconfig.h.in: Rename config.h nsconfig.h to prevent
        clashes wth module/library config.h files.
        * configure: Rebuild configure.


--- config.h.in DELETED ---

Index: nsthread.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/nsthread.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** nsthread.h	10 Jun 2005 20:53:12 -0000	1.6
--- nsthread.h	10 Jun 2005 21:52:36 -0000	1.7
***************
*** 39,43 ****
  #define NSTHREAD_H
  
! #include <config.h>
  #include <nscheck.h>
  
--- 39,43 ----
  #define NSTHREAD_H
  
! #include <nsconfig.h>
  #include <nscheck.h>
  

--- NEW FILE: nsconfig.h.in ---
/* include/nsconfig.h.in.  Generated from configure.in by autoheader.  */

/* Define to 1 if you have the `drand48' function. */
#undef HAVE_DRAND48

/* Define to 1 if you have the `fork1' function. */
#undef HAVE_FORK1

/* Define to 1 if you have the `getaddrinfo' function. */
#undef HAVE_GETADDRINFO

/* Define to 1 if gethostbyaddr_r is available. */
#undef HAVE_GETHOSTBYADDR_R

/* Define to 1 if gethostbyaddr_r takes 7 args. */
#undef HAVE_GETHOSTBYADDR_R_7

/* Define to 1 if gethostbyname_r is available. */
#undef HAVE_GETHOSTBYNAME_R

/* Define to 1 if gethostbyname_r takes 3 args. */
#undef HAVE_GETHOSTBYNAME_R_3

/* Define to 1 if gethostbyname_r takes 5 args. */
#undef HAVE_GETHOSTBYNAME_R_5

/* Define to 1 if gethostbyname_r takes 6 args. */
#undef HAVE_GETHOSTBYNAME_R_6

/* Define to 1 if you have the `getnameinfo' function. */
#undef HAVE_GETNAMEINFO

/* Define to 1 if you have the `gmtime_r' function. */
#undef HAVE_GMTIME_R

/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H

/* Define to 1 if you have the `socket' library (-lsocket). */
#undef HAVE_LIBSOCKET

/* Define to 1 if you have the `z' library (-lz). */
#undef HAVE_LIBZ

/* Do we have <limits.h>? */
#undef HAVE_LIMITS_H

/* Define to 1 if you have the `localtime_r' function. */
#undef HAVE_LOCALTIME_R

/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H

/* Do we have <net/errno.h>? */
#undef HAVE_NET_ERRNO_H

/* Define to 1 if you have the `poll' function. */
#undef HAVE_POLL

/* Define to 1 if you have the `pthread_attr_setstacksize' function. */
#undef HAVE_PTHREAD_ATTR_SETSTACKSIZE

/* Define to 1 if you have the `random' function. */
#undef HAVE_RANDOM

/* Define to 1 if you have the `readdir_r' function. */
#undef HAVE_READDIR_R

/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H

/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H

/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H

/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H

/* Is 'struct dirent64' in <sys/types.h>? */
#undef HAVE_STRUCT_DIRENT64

/* Is 'struct stat64' in <sys/stat.h>? */
#undef HAVE_STRUCT_STAT64

/* Define to 1 if `tm_zone' is member of `struct tm'. */
#undef HAVE_STRUCT_TM_TM_ZONE

/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H

/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H

/* Define to 1 if you have the <sys/time.h> header file. */
#undef HAVE_SYS_TIME_H

/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H

/* Define to 1 if you have the `timegm' function. */
#undef HAVE_TIMEGM

/* Should we use the global timezone variable? */
#undef HAVE_TIMEZONE_VAR

/* Should we use the tm_gmtoff field of struct tm? */
#undef HAVE_TM_GMTOFF

/* Should we use the tm_tzadj field of struct tm? */
#undef HAVE_TM_TZADJ

/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
   `HAVE_STRUCT_TM_TM_ZONE' instead. */
#undef HAVE_TM_ZONE

/* Is off64_t in <sys/types.h>? */
#undef HAVE_TYPE_OFF64_T

/* Define to 1 if you don't have `tm_zone' but do have the external array
   `tzname'. */
#undef HAVE_TZNAME

/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H

/* Define to 1 if you have the <zlib.h> header file. */
#undef HAVE_ZLIB_H

/* Define to 1 if you have the `_NSGetEnviron' function. */
#undef HAVE__NSGETENVIRON

/* Do we have <dirent.h>? */
#undef NO_DIRENT_H

/* Do we have <dlfcn.h>? */
#undef NO_DLFCN_H

/* Do we have <errno.h>? */
#undef NO_ERRNO_H

/* Do we have <float.h>? */
#undef NO_FLOAT_H

/* Do we have <limits.h>? */
#undef NO_LIMITS_H

/* Do we have <stdlib.h>? */
#undef NO_STDLIB_H

/* Do we have <string.h>? */
#undef NO_STRING_H

/* Do we have <sys/wait.h>? */
#undef NO_SYS_WAIT_H

/* Do we have <values.h>? */
#undef NO_VALUES_H

/* Major Version */
#undef NS_MAJOR_VERSION

/* Minor Version */
#undef NS_MINOR_VERSION

/* Patch Level */
#undef NS_PATCH_LEVEL

/* NS_ALPHA_RELASE, NS_BETA_RELEASE or NS_FINAL_RELEASE */
#undef NS_RELEASE_LEVEL

/* Release Serial */
#undef NS_RELEASE_SERIAL

/* Version */
#undef NS_VERSION

/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT

/* Define to the full name of this package. */
#undef PACKAGE_NAME

/* Define to the full name and version of this package. */
#undef PACKAGE_STRING

/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME

/* Define to the version of this package. */
#undef PACKAGE_VERSION

/* Is this a static build? */
#undef STATIC_BUILD

/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS

/* Is memory debugging enabled? */
#undef TCL_MEM_DEBUG

/* Are we building with threads enabled? */
#undef TCL_THREADS

/* Are wide integers to be implemented with C 'long's? */
#undef TCL_WIDE_INT_IS_LONG

/* What type should be used to define wide integers? */
#undef TCL_WIDE_INT_TYPE

/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME

/* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME

/* UNDER_CE version */
#undef UNDER_CE

/* Should we use <a.out.h> when doing dynamic loading? */
#undef USE_A_OUT_H

/* Do we need a special AIX hack for timezones? */
#undef USE_DELTA_FOR_TZ

/* Define to 1 if the <dl.h> header should be used. */
#undef USE_DLSHL

/* need for dup high */
#undef USE_DUPHIGH

/* Define to 1 if the <mach-o/dyld.h> header should be used. */
#undef USE_DYLD

/* Should we use <sys/exec_aout.h> when doing dynamic loading? */
#undef USE_SYS_EXEC_AOUT_H

/* Should we use <sys/exec.h> when doing dynamic loading? */
#undef USE_SYS_EXEC_H

/* Do we want to use the threaded memory allocator? */
#undef USE_THREAD_ALLOC

/* Define to 1 if your processor stores words with the most significant byte
   first (like Motorola and SPARC, unlike Intel and VAX). */
#undef WORDS_BIGENDIAN

/* Add the _ISOC99_SOURCE flag when building */
#undef _ISOC99_SOURCE

/* Add the _LARGEFILE64_SOURCE flag when building */
#undef _LARGEFILE64_SOURCE

/* # needed in sys/socket.h Should OS/390 do the right thing with sockets? */
#undef _OE_SOCKETS

/* Do we really want to follow the standard? Yes we do! */
#undef _POSIX_PTHREAD_SEMANTICS

/* Do we want the reentrant OS API? */
#undef _REENTRANT

/* Do we want the thread-safe OS API? */
#undef _THREAD_SAFE

/* _WIN32_WCE version */
#undef _WIN32_WCE

/* Do we want to use the XOPEN network library? */
#undef _XOPEN_SOURCE_EXTENDED

[naviserver-commits] naviserver ChangeLog,1.105,1.106 configure,1.8,1.9 configure.in,1.7,1.8

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

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

Modified Files:
	ChangeLog configure configure.in 
Log Message:
        * configure.in:
        * include/config.h.in:
        * include/nsthread.h:
        * include/nsconfig.h.in: Rename config.h nsconfig.h to prevent
        clashes wth module/library config.h files.
        * configure: Rebuild configure.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** ChangeLog	10 Jun 2005 20:53:12 -0000	1.105
--- ChangeLog	10 Jun 2005 21:52:35 -0000	1.106
***************
*** 42,45 ****
--- 42,52 ----
  2005-06-10  Stephen Deasey  <sd...@us...>
  
+ 	* configure.in:
+ 	* include/config.h.in:
+ 	* include/nsthread.h:
+ 	* include/nsconfig.h.in: Rename config.h nsconfig.h to prevent
+ 	clashes wth module/library config.h files.
+ 	* configure: Rebuild configure.
+ 
  	* include/ns.h:
  	* include/nsthread.h:

Index: configure
===================================================================
RCS file: /cvsroot/naviserver/naviserver/configure,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** configure	10 Jun 2005 02:42:19 -0000	1.8
--- configure	10 Jun 2005 21:52:35 -0000	1.9
***************
*** 1,4 ****
  #! /bin/sh
! # From configure.in Revision: 1.6 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.59 for NaviServer 4.99.0.
--- 1,4 ----
  #! /bin/sh
! # From configure.in Revision: 1.7 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.59 for NaviServer 4.99.0.
***************
*** 1321,1325 ****
  
  
!           ac_config_headers="$ac_config_headers include/config.h"
  
  
--- 1321,1325 ----
  
  
!           ac_config_headers="$ac_config_headers include/nsconfig.h"
  
  
***************
*** 13764,13768 ****
    "include/Makefile.global" ) CONFIG_FILES="$CONFIG_FILES include/Makefile.global" ;;
    "include/Makefile.module" ) CONFIG_FILES="$CONFIG_FILES include/Makefile.module" ;;
!   "include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
--- 13764,13768 ----
    "include/Makefile.global" ) CONFIG_FILES="$CONFIG_FILES include/Makefile.global" ;;
    "include/Makefile.module" ) CONFIG_FILES="$CONFIG_FILES include/Makefile.module" ;;
!   "include/nsconfig.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/nsconfig.h" ;;
    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

Index: configure.in
===================================================================
RCS file: /cvsroot/naviserver/naviserver/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** configure.in	10 Jun 2005 02:42:19 -0000	1.7
--- configure.in	10 Jun 2005 21:52:35 -0000	1.8
***************
*** 39,43 ****
  AC_INIT(NaviServer, 4.99.0, nav...@li...)
  AC_CONFIG_SRCDIR(include/ns.h)
! AC_CONFIG_HEADER(include/config.h)
  AC_PREREQ(2.50)
  AC_REVISION($Revision$)
--- 39,43 ----
  AC_INIT(NaviServer, 4.99.0, nav...@li...)
  AC_CONFIG_SRCDIR(include/ns.h)
! AC_CONFIG_HEADER(include/nsconfig.h)
  AC_PREREQ(2.50)
  AC_REVISION($Revision$)

[naviserver-commits] naviserver ChangeLog,1.104,1.105

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

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

Modified Files:
	ChangeLog 
Log Message:
Use CONST declarations to silence compiler.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** ChangeLog	10 Jun 2005 19:18:04 -0000	1.104
--- ChangeLog	10 Jun 2005 20:53:12 -0000	1.105
***************
*** 43,46 ****
--- 43,60 ----
  
  	* include/ns.h:
+ 	* include/nsthread.h:
+ 	* nsd/conn.c:
+ 	* nsd/nsd.h:
+ 	* nsd/pathname.c:
+ 	* nsd/rollfile.c:
+ 	* nsd/server.c:
+ 	* nsd/set.c:
+ 	* nsd/tclinit.c:
+ 	* nsd/tcljob.c:
+ 	* nsd/tclsock.c:
+ 	* nslog/nslog.c:
+ 	* nsthread/mutex.c: Use CONST declarations to silence compiler.
+ 
+ 	* include/ns.h:
  	* include/nsthread.h: Add a variety of NS_GNUC_* annotations.
  

[naviserver-commits] naviserver/nslog nslog.c,1.6,1.7

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

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

Modified Files:
	nslog.c 
Log Message:
Use CONST declarations to silence compiler.


Index: nslog.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nslog/nslog.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** nslog.c	10 Jun 2005 17:58:42 -0000	1.6
--- nslog.c	10 Jun 2005 20:53:13 -0000	1.7
***************
*** 114,118 ****
      char           *file;
      char           *rollfmt;
!     char           **extheaders;
      int            fd;
      int		   flags;
--- 114,118 ----
      char           *file;
      char           *rollfmt;
!     CONST char    **extheaders;
      int            fd;
      int		   flags;
***************
*** 295,299 ****
      Ns_Time now,diff;
      int quote,n,status;
!     register char **h,*p = 0;
  
      /* Compute the request's elapsed time. */
--- 295,300 ----
      Ns_Time now,diff;
      int quote,n,status;
!     CONST char **h;
!     register char *p = 0;
  
      /* Compute the request's elapsed time. */
***************
*** 473,477 ****
  
      if (STREQ(argv[1],"extendedheaders")) {
!         char **h,**h1,**h2 = logPtr->extheaders;
          Ns_DStringInit(&ds);
          if (argc > 2) {
--- 474,478 ----
  
      if (STREQ(argv[1],"extendedheaders")) {
!         CONST char **h,**h1,**h2 = logPtr->extheaders;
          Ns_DStringInit(&ds);
          if (argc > 2) {

[naviserver-commits] naviserver/include ns.h,1.23,1.24 nsthread.h,1.5,1.6

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

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

Modified Files:
	ns.h nsthread.h 
Log Message:
Use CONST declarations to silence compiler.


Index: ns.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/ns.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ns.h	10 Jun 2005 19:18:06 -0000	1.23
--- ns.h	10 Jun 2005 20:53:12 -0000	1.24
***************
*** 874,884 ****
  NS_EXTERN char *Ns_LogTime(char *timeBuf);
  NS_EXTERN char *Ns_LogTime2(char *timeBuf, int gmt);
- NS_EXTERN int   Ns_RollFile(char *file, int max);
- NS_EXTERN int   Ns_PurgeFiles(char *file, int max);
- NS_EXTERN int   Ns_RollFileByDate(char *file, int max);
  NS_EXTERN void  Ns_SetLogFlushProc(Ns_LogFlushProc *procPtr);
  NS_EXTERN void  Ns_SetNsLogProc(Ns_LogProc *procPtr);
  
  /*
   * nsmain.c:
   */
--- 874,889 ----
  NS_EXTERN char *Ns_LogTime(char *timeBuf);
  NS_EXTERN char *Ns_LogTime2(char *timeBuf, int gmt);
  NS_EXTERN void  Ns_SetLogFlushProc(Ns_LogFlushProc *procPtr);
  NS_EXTERN void  Ns_SetNsLogProc(Ns_LogProc *procPtr);
  
  /*
+  * rollfile.c
+  */
+ 
+ NS_EXTERN int Ns_RollFile(CONST char *file, int max);
+ NS_EXTERN int Ns_PurgeFiles(CONST char *file, int max);
+ NS_EXTERN int Ns_RollFileByDate(CONST char *file, int max);
+ 
+ /*
   * nsmain.c:
   */
***************
*** 959,971 ****
   */
  
! NS_EXTERN int Ns_PathIsAbsolute(char *path);
! NS_EXTERN char *Ns_NormalizePath(Ns_DString *dsPtr, char *path);
  NS_EXTERN char *Ns_MakePath(Ns_DString *dsPtr, ...);
! NS_EXTERN char *Ns_HashPath(Ns_DString *dsPtr, char *string, int levels);
  NS_EXTERN char *Ns_LibPath(Ns_DString *dsPtr, ...);
  NS_EXTERN char *Ns_HomePath(Ns_DString *dsPtr, ...);
! NS_EXTERN char *Ns_ModulePath(Ns_DString *dsPtr, char *server, char *module, ...);
! NS_EXTERN char *Ns_ServerPath(Ns_DString *dest, char *server, ...);
! NS_EXTERN char *Ns_PagePath(Ns_DString *dest, char *server, ...);
  NS_EXTERN int Ns_SetServerRootProc(Ns_ServerRootProc *proc, void *arg);
  
--- 964,977 ----
   */
  
! NS_EXTERN int Ns_PathIsAbsolute(CONST char *path);
! NS_EXTERN char *Ns_NormalizePath(Ns_DString *dsPtr, CONST char *path);
  NS_EXTERN char *Ns_MakePath(Ns_DString *dsPtr, ...);
! NS_EXTERN char *Ns_HashPath(Ns_DString *dsPtr, CONST char *string, int levels);
  NS_EXTERN char *Ns_LibPath(Ns_DString *dsPtr, ...);
  NS_EXTERN char *Ns_HomePath(Ns_DString *dsPtr, ...);
! NS_EXTERN char *Ns_ModulePath(Ns_DString *dsPtr, CONST char *server,
!                               CONST char *module, ...);
! NS_EXTERN char *Ns_ServerPath(Ns_DString *dest, CONST char *server, ...);
! NS_EXTERN char *Ns_PagePath(Ns_DString *dest, CONST char *server, ...);
  NS_EXTERN int Ns_SetServerRootProc(Ns_ServerRootProc *proc, void *arg);
  
***************
*** 1070,1095 ****
   */
  
! NS_EXTERN void Ns_SetUpdate(Ns_Set *set, char *key, char *value);
! NS_EXTERN Ns_Set *Ns_SetCreate(char *name);
  NS_EXTERN void Ns_SetFree(Ns_Set *set);
! NS_EXTERN int Ns_SetPut(Ns_Set *set, char *key, char *value);
! NS_EXTERN int Ns_SetUniqueCmp(Ns_Set *set, char *key, int (*cmp) (char *s1,
! 			   char *s2));
! NS_EXTERN int Ns_SetFindCmp(Ns_Set *set, char *key, int (*cmp) (char *s1,
! 			 char *s2));
! NS_EXTERN char *Ns_SetGetCmp(Ns_Set *set, char *key, int (*cmp) (char *s1,
! 			  char *s2));
! NS_EXTERN int Ns_SetUnique(Ns_Set *set, char *key);
! NS_EXTERN int Ns_SetIUnique(Ns_Set *set, char *key);
! NS_EXTERN int Ns_SetFind(Ns_Set *set, char *key);
! NS_EXTERN int Ns_SetIFind(Ns_Set *set, char *key);
! NS_EXTERN char *Ns_SetGet(Ns_Set *set, char *key);
! NS_EXTERN char *Ns_SetIGet(Ns_Set *set, char *key);
  NS_EXTERN void Ns_SetTrunc(Ns_Set *set, int size);
  NS_EXTERN void Ns_SetDelete(Ns_Set *set, int index);
! NS_EXTERN void Ns_SetPutValue(Ns_Set *set, int index, char *value);
! NS_EXTERN void Ns_SetDeleteKey(Ns_Set *set, char *key);
! NS_EXTERN void Ns_SetIDeleteKey(Ns_Set *set, char *key);
! NS_EXTERN Ns_Set *Ns_SetListFind(Ns_Set **sets, char *name);
  NS_EXTERN Ns_Set **Ns_SetSplit(Ns_Set *set, char sep);
  NS_EXTERN void Ns_SetListFree(Ns_Set **sets);
--- 1076,1101 ----
   */
  
! NS_EXTERN void Ns_SetUpdate(Ns_Set *set, CONST char *key, CONST char *value);
! NS_EXTERN Ns_Set *Ns_SetCreate(CONST char *name);
  NS_EXTERN void Ns_SetFree(Ns_Set *set);
! NS_EXTERN int Ns_SetPut(Ns_Set *set, CONST char *key, CONST char *value);
! NS_EXTERN int Ns_SetUniqueCmp(Ns_Set *set, CONST char *key,
!                               int (*cmp) (CONST char *s1, CONST char *s2));
! NS_EXTERN int Ns_SetFindCmp(Ns_Set *set, CONST char *key,
!                             int (*cmp) (CONST char *s1, CONST char *s2));
! NS_EXTERN char *Ns_SetGetCmp(Ns_Set *set, CONST char *key,
!                              int (*cmp) (CONST char *s1, CONST char *s2));
! NS_EXTERN int Ns_SetUnique(Ns_Set *set, CONST char *key);
! NS_EXTERN int Ns_SetIUnique(Ns_Set *set, CONST char *key);
! NS_EXTERN int Ns_SetFind(Ns_Set *set, CONST char *key);
! NS_EXTERN int Ns_SetIFind(Ns_Set *set, CONST char *key);
! NS_EXTERN char *Ns_SetGet(Ns_Set *set, CONST char *key);
! NS_EXTERN char *Ns_SetIGet(Ns_Set *set, CONST char *key);
  NS_EXTERN void Ns_SetTrunc(Ns_Set *set, int size);
  NS_EXTERN void Ns_SetDelete(Ns_Set *set, int index);
! NS_EXTERN void Ns_SetPutValue(Ns_Set *set, int index, CONST char *value);
! NS_EXTERN void Ns_SetDeleteKey(Ns_Set *set, CONST char *key);
! NS_EXTERN void Ns_SetIDeleteKey(Ns_Set *set, CONST char *key);
! NS_EXTERN Ns_Set *Ns_SetListFind(Ns_Set **sets, CONST char *name);
  NS_EXTERN Ns_Set **Ns_SetSplit(Ns_Set *set, char sep);
  NS_EXTERN void Ns_SetListFree(Ns_Set **sets);
***************
*** 1220,1224 ****
  NS_EXTERN Tcl_Interp *Ns_TclCreateInterp(void);
  NS_EXTERN void Ns_TclDestroyInterp(Tcl_Interp *interp);
! NS_EXTERN Tcl_Interp *Ns_TclAllocateInterp(char *server);
  NS_EXTERN void Ns_TclDeAllocateInterp(Tcl_Interp *interp);
  NS_EXTERN char *Ns_TclLibrary(char *server);
--- 1226,1230 ----
  NS_EXTERN Tcl_Interp *Ns_TclCreateInterp(void);
  NS_EXTERN void Ns_TclDestroyInterp(Tcl_Interp *interp);
! NS_EXTERN Tcl_Interp *Ns_TclAllocateInterp(CONST char *server);
  NS_EXTERN void Ns_TclDeAllocateInterp(Tcl_Interp *interp);
  NS_EXTERN char *Ns_TclLibrary(char *server);

Index: nsthread.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/nsthread.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** nsthread.h	10 Jun 2005 19:18:07 -0000	1.5
--- nsthread.h	10 Jun 2005 20:53:12 -0000	1.6
***************
*** 214,219 ****
  NS_EXTERN int  Ns_MutexTryLock(Ns_Mutex *mutexPtr);
  NS_EXTERN void Ns_MutexUnlock(Ns_Mutex *mutexPtr);
! NS_EXTERN void Ns_MutexSetName(Ns_Mutex *mutexPtr, char *name);
! NS_EXTERN void Ns_MutexSetName2(Ns_Mutex *mutexPtr, char *prefix, char *name);
  NS_EXTERN void Ns_MutexList(Tcl_DString *dsPtr);
  
--- 214,220 ----
  NS_EXTERN int  Ns_MutexTryLock(Ns_Mutex *mutexPtr);
  NS_EXTERN void Ns_MutexUnlock(Ns_Mutex *mutexPtr);
! NS_EXTERN void Ns_MutexSetName(Ns_Mutex *mutexPtr, CONST char *name);
! NS_EXTERN void Ns_MutexSetName2(Ns_Mutex *mutexPtr, CONST char *prefix,
!                                 CONST char *name);
  NS_EXTERN void Ns_MutexList(Tcl_DString *dsPtr);
  

[naviserver-commits] naviserver/nsthread mutex.c,1.2,1.3

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

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

Modified Files:
	mutex.c 
Log Message:
Use CONST declarations to silence compiler.


Index: mutex.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsthread/mutex.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mutex.c	10 Jun 2005 17:58:59 -0000	1.2
--- mutex.c	10 Jun 2005 20:53:13 -0000	1.3
***************
*** 109,113 ****
  
  void
! Ns_MutexSetName(Ns_Mutex *mutex, char *name)
  {
      Ns_MutexSetName2(mutex, name, NULL);
--- 109,113 ----
  
  void
! Ns_MutexSetName(Ns_Mutex *mutex, CONST char *name)
  {
      Ns_MutexSetName2(mutex, name, NULL);
***************
*** 115,119 ****
  
  void
! Ns_MutexSetName2(Ns_Mutex *mutex, char *prefix, char *name)
  {
      Mutex *mutexPtr = GETMUTEX(mutex);
--- 115,119 ----
  
  void
! Ns_MutexSetName2(Ns_Mutex *mutex, CONST char *prefix, CONST char *name)
  {
      Mutex *mutexPtr = GETMUTEX(mutex);