[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);