[naviserver-commits] naviserver/nsd conn.c,1.14,1.15 nsd.h,1.13,1.14 pathname.c,1.3,1.4 rollfile.c,1

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	conn.c nsd.h pathname.c rollfile.c server.c set.c tclinit.c 
	tcljob.c tclsock.c 
Log Message:
Use CONST declarations to silence compiler.

Index: tclinit.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclinit.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tclinit.c	10 Jun 2005 17:58:40 -0000	1.5
--- tclinit.c	10 Jun 2005 20:53:13 -0000	1.6
***************
*** 387,391 ****

  Tcl_Interp *
! Ns_TclAllocateInterp(char *server)
  {
      Tcl_HashEntry *hPtr;
--- 387,391 ----

  Tcl_Interp *
! Ns_TclAllocateInterp(CONST char *server)
  {
      Tcl_HashEntry *hPtr;

Index: server.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/server.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** server.c	10 Jun 2005 17:58:39 -0000	1.4
--- server.c	10 Jun 2005 20:53:13 -0000	1.5
***************
*** 68,72 ****

  NsServer *
! NsGetServer(char *server)
  {
      Tcl_HashEntry *hPtr;
--- 68,72 ----

  NsServer *
! NsGetServer(CONST char *server)
  {
      Tcl_HashEntry *hPtr;

Index: conn.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/conn.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** conn.c	10 Jun 2005 17:58:38 -0000	1.14
--- conn.c	10 Jun 2005 20:53:13 -0000	1.15
***************
*** 1028,1033 ****
          }
          if (connPtr->encoding != NULL) {
!             Tcl_SetResult(interp, Tcl_GetEncodingName(connPtr->encoding),
!                           TCL_STATIC);
          }
          break;
--- 1028,1032 ----
          }
          if (connPtr->encoding != NULL) {
!             Tcl_SetStringObj(result, Tcl_GetEncodingName(connPtr->encoding), -1);
          }
          break;
***************
*** 1054,1059 ****
          }
          if (connPtr->urlEncoding != NULL) {
!             Tcl_SetResult(interp, Tcl_GetEncodingName(connPtr->urlEncoding),
!                           TCL_STATIC);
          }
          break;
--- 1053,1057 ----
          }
          if (connPtr->urlEncoding != NULL) {
!             Tcl_SetStringObj(result, Tcl_GetEncodingName(connPtr->urlEncoding), -1);
          }
          break;
***************
*** 1268,1272 ****
          }
          Tcl_RegisterChannel(interp, chan);
!         Tcl_SetResult(interp, Tcl_GetChannelName(chan), TCL_STATIC);
      }

--- 1266,1270 ----
          }
          Tcl_RegisterChannel(interp, chan);
!         Tcl_SetStringObj(result, Tcl_GetChannelName(chan), -1);
      }

Index: tcljob.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tcljob.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcljob.c	10 Jun 2005 17:58:40 -0000	1.4
--- tcljob.c	10 Jun 2005 20:53:13 -0000	1.5
***************
*** 126,130 ****
  typedef struct Job {
      struct Job      *nextPtr;
!     char	    *server;
      JobStates        state;
      int              code;
--- 126,130 ----
  typedef struct Job {
      struct Job      *nextPtr;
!     CONST char      *server;
      JobStates        state;
      int              code;
***************
*** 834,839 ****

              Tcl_Obj     *jobList, *jobFieldList;
!             char        *jobId, *jobState, *jobCode, *jobType;
!             char        *jobResults, *jobScript, *jobReq;
              double      delta;

--- 834,839 ----

              Tcl_Obj     *jobList, *jobFieldList;
!             CONST char  *jobId, *jobState, *jobCode, *jobType, *jobReq;
!             char        *jobResults, *jobScript;
              double      delta;

***************
*** 928,932 ****
               */
              Tcl_Obj     *queueList, *queueFieldList;
!             char        *queueReq;

              /* Create a Tcl List to hold the list of jobs. */
--- 928,932 ----
               */
              Tcl_Obj     *queueList, *queueFieldList;
!             CONST char  *queueReq;

              /* Create a Tcl List to hold the list of jobs. */
***************
*** 1002,1006 ****

              Tcl_Obj     *tpFieldList;
!             char        *tpReq;

              /* Create a Tcl List to hold the list of thread fields. */
--- 1002,1006 ----

              Tcl_Obj     *tpFieldList;
!             CONST char  *tpReq;

              /* Create a Tcl List to hold the list of thread fields. */

Index: rollfile.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/rollfile.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rollfile.c	10 Jun 2005 17:58:39 -0000	1.2
--- rollfile.c	10 Jun 2005 20:53:13 -0000	1.3
***************
*** 47,55 ****
   */

! static int AppendFile(Ns_DString *dsPtr, char *dir, char *tail);
  static int CmpFile(const void *p1, const void *p2);
! static int Rename(char *from, char *to);
! static int Exists(char *file);
! static int Unlink(char *file);

--- 47,55 ----
   */

! static int AppendFile(Ns_DString *dsPtr, CONST char *dir, CONST char *tail);
  static int CmpFile(const void *p1, const void *p2);
! static int Rename(CONST char *from, CONST char *to);
! static int Exists(CONST char *file);
! static int Unlink(CONST char *file);

***************
*** 78,82 ****

  int
! Ns_RollFile(char *file, int max)
  {
      char *first, *next, *dot;
--- 78,82 ----

  int
! Ns_RollFile(CONST char *file, int max)
  {
      char *first, *next, *dot;
***************
*** 148,152 ****

  int
! Ns_RollFileByDate(char *file, int max)
  {
      return Ns_PurgeFiles(file, max);
--- 148,152 ----

  int
! Ns_RollFileByDate(CONST char *file, int max)
  {
      return Ns_PurgeFiles(file, max);
***************
*** 154,158 ****

  int
! Ns_PurgeFiles(char *file, int max)
  {
      char *slash, *tail;
--- 154,158 ----

  int
! Ns_PurgeFiles(CONST char *file, int max)
  {
      char *slash, *tail;
***************
*** 242,246 ****

  static int
! AppendFile(Ns_DString *dsPtr, char *dir, char *tail)
  {
      File *fPtr;
--- 242,246 ----

  static int
! AppendFile(Ns_DString *dsPtr, CONST char *dir, CONST char *tail)
  {
      File *fPtr;
***************
*** 309,313 ****

  static int
! Unlink(char *file)
  {
      int err;
--- 309,313 ----

  static int
! Unlink(CONST char *file)
  {
      int err;
***************
*** 322,326 ****

  static int
! Rename(char *from, char *to)
  {
      int err;
--- 322,326 ----

  static int
! Rename(CONST char *from, CONST char *to)
  {
      int err;
***************
*** 335,339 ****

  static int
! Exists(char *file)
  {
      int exists;
--- 335,339 ----

  static int
! Exists(CONST char *file)
  {
      int exists;

Index: nsd.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/nsd.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** nsd.h	16 May 2005 01:25:02 -0000	1.13
--- nsd.h	10 Jun 2005 20:53:13 -0000	1.14
***************
*** 829,833 ****
  extern void NsFreeRequest(Request *reqPtr);

! extern NsServer *NsGetServer(char *server);
  extern NsServer *NsGetInitServer(void);
  extern NsInterp *NsGetInterp(Tcl_Interp *interp);
--- 829,833 ----
  extern void NsFreeRequest(Request *reqPtr);

! extern NsServer *NsGetServer(CONST char *server);
  extern NsServer *NsGetInitServer(void);
  extern NsInterp *NsGetInterp(Tcl_Interp *interp);

Index: pathname.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/pathname.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pathname.c	10 Jun 2005 17:58:39 -0000	1.3
--- pathname.c	10 Jun 2005 20:53:13 -0000	1.4
***************
*** 69,73 ****

  int
! Ns_PathIsAbsolute(char *path)
  {
  #ifdef _WIN32
--- 69,73 ----

  int
! Ns_PathIsAbsolute(CONST char *path)
  {
  #ifdef _WIN32
***************
*** 100,104 ****

  char *
! Ns_NormalizePath(Ns_DString *dsPtr, char *path)
  {
      char end;
--- 100,104 ----

  char *
! Ns_NormalizePath(Ns_DString *dsPtr, CONST char *path)
  {
      char end;
***************
*** 228,234 ****

  char *
! Ns_HashPath(Ns_DString *dest, char *string, int levels)
  {
!     char *p = string;
      int   i;

--- 228,234 ----

  char *
! Ns_HashPath(Ns_DString *dest, CONST char *string, int levels)
  {
!     CONST char *p = string;
      int   i;

***************
*** 333,337 ****

  char *
! Ns_ServerPath(Ns_DString *dest, char *server, ...)
  {
      NsServer *servPtr;
--- 333,337 ----

  char *
! Ns_ServerPath(Ns_DString *dest, CONST char *server, ...)
  {
      NsServer *servPtr;
***************
*** 369,373 ****

  char *
! Ns_PagePath(Ns_DString *dest, char *server, ...)
  {
      NsServer *servPtr;
--- 369,373 ----

  char *
! Ns_PagePath(Ns_DString *dest, CONST char *server, ...)
  {
      NsServer *servPtr;
***************
*** 407,411 ****

  char *
! Ns_ModulePath(Ns_DString *dest, char *server, char *module, ...)
  {
      va_list         ap;
--- 407,411 ----

  char *
! Ns_ModulePath(Ns_DString *dest, CONST char *server, CONST char *module, ...)
  {
      va_list         ap;

Index: set.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/set.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** set.c	10 Jun 2005 17:58:39 -0000	1.2
--- set.c	10 Jun 2005 20:53:13 -0000	1.3
***************
*** 57,61 ****

  void
! Ns_SetUpdate(Ns_Set *set, char *key, char *value)
  {
      Ns_SetDeleteKey(set, key);
--- 57,61 ----

  void
! Ns_SetUpdate(Ns_Set *set, CONST char *key, CONST char *value)
  {
      Ns_SetDeleteKey(set, key);
***************
*** 81,85 ****

  Ns_Set *
! Ns_SetCreate(char *name)
  {
      Ns_Set *setPtr;
--- 81,85 ----

  Ns_Set *
! Ns_SetCreate(CONST char *name)
  {
      Ns_Set *setPtr;
***************
*** 144,148 ****

  int
! Ns_SetPut(Ns_Set *set, char *key, char *value)
  {
      int index;
--- 144,148 ----

  int
! Ns_SetPut(Ns_Set *set, CONST char *key, CONST char *value)
  {
      int index;
***************
*** 181,185 ****

  int
! Ns_SetUniqueCmp(Ns_Set *set, char *key, int (*cmp) (char *s1, char *s2))
  {
      int   i;
--- 181,186 ----

  int
! Ns_SetUniqueCmp(Ns_Set *set, CONST char *key,
!                 int (*cmp) (CONST char *s1, CONST char *s2))
  {
      int   i;
***************
*** 221,225 ****

  int
! Ns_SetFindCmp(Ns_Set *set, char *key, int (*cmp) (char *s1, char *s2))
  {
      int   i;
--- 222,227 ----

  int
! Ns_SetFindCmp(Ns_Set *set, CONST char *key,
!               int (*cmp) (CONST char *s1, CONST char *s2))
  {
      int   i;
***************
*** 257,261 ****

  char *
! Ns_SetGetCmp(Ns_Set *set, char *key, int (*cmp) (char *s1, char *s2))
  {
      int             i;
--- 259,264 ----

  char *
! Ns_SetGetCmp(Ns_Set *set, CONST char *key,
!              int (*cmp) (CONST char *s1, CONST char *s2))
  {
      int             i;
***************
*** 286,292 ****

  int
! Ns_SetUnique(Ns_Set *set, char *key)
  {
!     return Ns_SetUniqueCmp(set, key, (int (*) (char *, char *)) strcmp);
  }

--- 289,296 ----

  int
! Ns_SetUnique(Ns_Set *set, CONST char *key)
  {
!     return Ns_SetUniqueCmp(set, key,
!                            (int (*) (CONST char *, CONST char *)) strcmp);
  }

***************
*** 309,315 ****

  int
! Ns_SetIUnique(Ns_Set *set, char *key)
  {
!     return Ns_SetUniqueCmp(set, key, (int (*) (char *, char *)) strcasecmp);
  }

--- 313,320 ----

  int
! Ns_SetIUnique(Ns_Set *set, CONST char *key)
  {
!     return Ns_SetUniqueCmp(set, key,
!                            (int (*) (CONST char *, CONST char *)) strcasecmp);
  }

***************
*** 332,338 ****

  int
! Ns_SetFind(Ns_Set *set, char *key)
  {
!     return Ns_SetFindCmp(set, key, (int (*) (char *, char *)) strcmp);
  }

--- 337,344 ----

  int
! Ns_SetFind(Ns_Set *set, CONST char *key)
  {
!     return Ns_SetFindCmp(set, key,
!                          (int (*) (CONST char *, CONST char *)) strcmp);
  }

***************
*** 355,361 ****

  int
! Ns_SetIFind(Ns_Set *set, char *key)
  {
!     return Ns_SetFindCmp(set, key, (int (*) (char *, char *)) strcasecmp);
  }

--- 361,368 ----

  int
! Ns_SetIFind(Ns_Set *set, CONST char *key)
  {
!     return Ns_SetFindCmp(set, key,
!                          (int (*) (CONST char *, CONST char *)) strcasecmp);
  }

***************
*** 378,384 ****

  char *
! Ns_SetGet(Ns_Set *set, char *key)
  {
!     return Ns_SetGetCmp(set, key, (int (*) (char *, char *)) strcmp);
  }

--- 385,392 ----

  char *
! Ns_SetGet(Ns_Set *set, CONST char *key)
  {
!     return Ns_SetGetCmp(set, key,
!                         (int (*) (CONST char *, CONST char *)) strcmp);
  }

***************
*** 401,407 ****

  char *
! Ns_SetIGet(Ns_Set *set, char *key)
  {
!     return Ns_SetGetCmp(set, key, (int (*) (char *, char *)) strcasecmp);
  }

--- 409,416 ----

  char *
! Ns_SetIGet(Ns_Set *set, CONST char *key)
  {
!     return Ns_SetGetCmp(set, key,
!                         (int (*) (CONST char *, CONST char *)) strcasecmp);
  }

***************
*** 488,492 ****

  void
! Ns_SetPutValue(Ns_Set *set, int index, char *value)
  {
      if ((index != -1) && (index < set->size)) {
--- 497,501 ----

  void
! Ns_SetPutValue(Ns_Set *set, int index, CONST char *value)
  {
      if ((index != -1) && (index < set->size)) {
***************
*** 514,518 ****

  void
! Ns_SetDeleteKey(Ns_Set *set, char *key)
  {
      Ns_SetDelete(set, Ns_SetFind(set, key));
--- 523,527 ----

  void
! Ns_SetDeleteKey(Ns_Set *set, CONST char *key)
  {
      Ns_SetDelete(set, Ns_SetFind(set, key));
***************
*** 537,541 ****

  void
! Ns_SetIDeleteKey(Ns_Set *set, char *key)
  {
      Ns_SetDelete(set, Ns_SetIFind(set, key));
--- 546,550 ----

  void
! Ns_SetIDeleteKey(Ns_Set *set, CONST char *key)
  {
      Ns_SetDelete(set, Ns_SetIFind(set, key));
***************
*** 561,565 ****

  Ns_Set *
! Ns_SetListFind(Ns_Set **sets, char *name)
  {
      while (*sets != NULL) {
--- 570,574 ----

  Ns_Set *
! Ns_SetListFind(Ns_Set **sets, CONST char *name)
  {
      while (*sets != NULL) {

Index: tclsock.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclsock.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tclsock.c	10 Jun 2005 17:58:41 -0000	1.3
--- tclsock.c	10 Jun 2005 20:53:13 -0000	1.4
***************
*** 486,490 ****

      if (sock == INVALID_SOCKET) {
!         char *why = Tcl_GetErrno() ? Tcl_PosixError(interp) : "reason unknown";
          Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
                  "can't connect to \"", host, ":",
--- 486,490 ----

      if (sock == INVALID_SOCKET) {
!         CONST char *why = Tcl_GetErrno() ? Tcl_PosixError(interp) : "reason unknown";
          Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
                  "can't connect to \"", host, ":",

[naviserver-commits] naviserver/nsd conn.c,1.14,1.15 nsd.h,1.13,1.14 pathname.c,1.3,1.4 rollfile.c,1

NaviServer, a high performance web server written in C and Tcl

[naviserver-commits] naviserver/nsd conn.c,1.14,1.15 nsd.h,1.13,1.14 pathname.c,1.3,1.4 rollfile.c,1.2,1.3 server.c,1.4,1.5 set.c,1.2,1.3 tclinit.c,1.5,1.6 tcljob.c,1.4,1.5 tclsock.c,1.3,1.4