[naviserver-commits] naviserver/include ns.h,1.22,1.23 nsthread.h,1.4,1.5

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

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

Modified Files:
	ns.h nsthread.h 
Log Message:
Add a variety of NS_GNUC_* annotations.


Index: ns.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/ns.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ns.h	10 Jun 2005 14:30:39 -0000	1.22
--- ns.h	10 Jun 2005 19:18:06 -0000	1.23
***************
*** 570,574 ****
   */
  
! NS_EXTERN int Ns_Compress(char *buf, int len, Tcl_DString *outPtr, int level);
  NS_EXTERN int Ns_CompressGzip(char *buf, int len, Tcl_DString *outPtr, int level);
  
--- 570,575 ----
   */
  
! NS_EXTERN int Ns_Compress(char *buf, int len, Tcl_DString *outPtr, int level)
!      NS_GNUC_DEPRECATED;
  NS_EXTERN int Ns_CompressGzip(char *buf, int len, Tcl_DString *outPtr, int level);
  
***************
*** 635,639 ****
  NS_EXTERN char *Ns_ConnPeer(Ns_Conn *conn);
  NS_EXTERN int Ns_ConnPeerPort(Ns_Conn *conn);
! NS_EXTERN char *Ns_ConnLocation(Ns_Conn *conn);
  NS_EXTERN char *Ns_ConnLocationAppend(Ns_Conn *conn, Ns_DString *dest);
  NS_EXTERN char *Ns_ConnHost(Ns_Conn *conn);
--- 636,640 ----
  NS_EXTERN char *Ns_ConnPeer(Ns_Conn *conn);
  NS_EXTERN int Ns_ConnPeerPort(Ns_Conn *conn);
! NS_EXTERN char *Ns_ConnLocation(Ns_Conn *conn) NS_GNUC_DEPRECATED;
  NS_EXTERN char *Ns_ConnLocationAppend(Ns_Conn *conn, Ns_DString *dest);
  NS_EXTERN char *Ns_ConnHost(Ns_Conn *conn);
***************
*** 646,650 ****
  NS_EXTERN void Ns_ConnSetUrlEncoding(Ns_Conn *conn, Tcl_Encoding encoding);
  NS_EXTERN int Ns_SetConnLocationProc(Ns_ConnLocationProc *proc, void *arg);
! NS_EXTERN void Ns_SetLocationProc(char *server, Ns_LocationProc *proc); /* depreciated */
  
  /*
--- 647,651 ----
  NS_EXTERN void Ns_ConnSetUrlEncoding(Ns_Conn *conn, Tcl_Encoding encoding);
  NS_EXTERN int Ns_SetConnLocationProc(Ns_ConnLocationProc *proc, void *arg);
! NS_EXTERN void Ns_SetLocationProc(char *server, Ns_LocationProc *proc) NS_GNUC_DEPRECATED;
  
  /*
***************
*** 687,691 ****
  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_EXTERN char *Ns_DStringVPrintf(Ns_DString *dsPtr, char *fmt, va_list ap);
  NS_EXTERN char *Ns_DStringAppendArg(Ns_DString *dsPtr, char *string);
--- 688,693 ----
  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);
***************
*** 711,715 ****
   */
  
! NS_EXTERN char *Ns_PageRoot(char *server);
  NS_EXTERN void Ns_SetUrlToFileProc(char *server, Ns_UrlToFileProc *procPtr);
  NS_EXTERN int Ns_UrlToFile(Ns_DString *dsPtr, char *server, char *url);
--- 713,717 ----
   */
  
! NS_EXTERN char *Ns_PageRoot(char *server) NS_GNUC_DEPRECATED;
  NS_EXTERN void Ns_SetUrlToFileProc(char *server, Ns_UrlToFileProc *procPtr);
  NS_EXTERN int Ns_UrlToFile(Ns_DString *dsPtr, char *server, char *url);
***************
*** 868,873 ****
  NS_EXTERN char *Ns_InfoErrorLog(void);
  NS_EXTERN int   Ns_LogRoll(void);
! NS_EXTERN void  Ns_Log(Ns_LogSeverity severity, char *fmt, ...);
! NS_EXTERN void  Ns_Fatal(char *fmt, ...);
  NS_EXTERN char *Ns_LogTime(char *timeBuf);
  NS_EXTERN char *Ns_LogTime2(char *timeBuf, int gmt);
--- 870,875 ----
  NS_EXTERN char *Ns_InfoErrorLog(void);
  NS_EXTERN int   Ns_LogRoll(void);
! NS_EXTERN void  Ns_Log(Ns_LogSeverity severity, char *fmt, ...) NS_GNUC_PRINTF(2, 3);
! NS_EXTERN void  Ns_Fatal(char *fmt, ...) NS_GNUC_PRINTF(1, 2) NS_GNUC_NORETURN;
  NS_EXTERN char *Ns_LogTime(char *timeBuf);
  NS_EXTERN char *Ns_LogTime2(char *timeBuf, int gmt);
***************
*** 1013,1018 ****
  NS_EXTERN void Ns_ConnSetLastModifiedHeader(Ns_Conn *conn, time_t *mtime);
  NS_EXTERN void Ns_ConnSetExpiresHeader(Ns_Conn *conn, char *expires);
! NS_EXTERN int Ns_ConnPrintfHeader(Ns_Conn *conn, char *fmt,...);
! NS_EXTERN int Ns_ConnResetReturn(Ns_Conn *conn);
  NS_EXTERN int Ns_ConnReturnAdminNotice(Ns_Conn *conn, int status, char *title,
  				    char *notice);
--- 1015,1020 ----
  NS_EXTERN void Ns_ConnSetLastModifiedHeader(Ns_Conn *conn, time_t *mtime);
  NS_EXTERN void Ns_ConnSetExpiresHeader(Ns_Conn *conn, char *expires);
! NS_EXTERN int Ns_ConnPrintfHeader(Ns_Conn *conn, char *fmt, ...) NS_GNUC_PRINTF(2, 3);
! NS_EXTERN int Ns_ConnResetReturn(Ns_Conn *conn) NS_GNUC_DEPRECATED;
  NS_EXTERN int Ns_ConnReturnAdminNotice(Ns_Conn *conn, int status, char *title,
  				    char *notice);
***************
*** 1127,1131 ****
  NS_EXTERN int Ns_SockWait(SOCKET sock, int what, int timeout);
  
! NS_EXTERN SOCKET Ns_BindSock(struct sockaddr_in *psa);
  NS_EXTERN SOCKET Ns_SockBind(struct sockaddr_in *psa);
  NS_EXTERN SOCKET Ns_SockListen(char *address, int port);
--- 1129,1133 ----
  NS_EXTERN int Ns_SockWait(SOCKET sock, int what, int timeout);
  
! NS_EXTERN SOCKET Ns_BindSock(struct sockaddr_in *psa) NS_GNUC_DEPRECATED;
  NS_EXTERN SOCKET Ns_SockBind(struct sockaddr_in *psa);
  NS_EXTERN SOCKET Ns_SockListen(char *address, int port);
***************
*** 1210,1214 ****
  
  NS_EXTERN int Ns_TclInit(Tcl_Interp *interp);
! NS_EXTERN void Ns_TclPrintfResult(Tcl_Interp *interp, char *fmt, ...);
  NS_EXTERN int Nsd_Init(Tcl_Interp *interp);
  NS_EXTERN int Ns_TclInitInterps(char *server, Ns_TclInterpInitProc *proc, void *arg);
--- 1212,1216 ----
  
  NS_EXTERN int Ns_TclInit(Tcl_Interp *interp);
! NS_EXTERN void Ns_TclPrintfResult(Tcl_Interp *interp, char *fmt, ...) NS_GNUC_PRINTF(2, 3);
  NS_EXTERN int Nsd_Init(Tcl_Interp *interp);
  NS_EXTERN int Ns_TclInitInterps(char *server, Ns_TclInterpInitProc *proc, void *arg);
***************
*** 1273,1283 ****
  NS_EXTERN char *Ns_UrlQueryDecode(Ns_DString *dsPtr, char *str, Tcl_Encoding enc);
  NS_EXTERN char *Ns_EncodeUrlWithEncoding(Ns_DString *dsPtr, char *string,
!                                          Tcl_Encoding encoding);
  NS_EXTERN char *Ns_DecodeUrlWithEncoding(Ns_DString *dsPtr, char *string,
!                                          Tcl_Encoding encoding);
  NS_EXTERN char *Ns_EncodeUrlCharset(Ns_DString *dsPtr, char *string,
!                                     char *charset);
  NS_EXTERN char *Ns_DecodeUrlCharset(Ns_DString *dsPtr, char *string,
!                                     char *charset);
  
  /*
--- 1275,1285 ----
  NS_EXTERN char *Ns_UrlQueryDecode(Ns_DString *dsPtr, char *str, Tcl_Encoding enc);
  NS_EXTERN char *Ns_EncodeUrlWithEncoding(Ns_DString *dsPtr, char *string,
!                                          Tcl_Encoding encoding) NS_GNUC_DEPRECATED;
  NS_EXTERN char *Ns_DecodeUrlWithEncoding(Ns_DString *dsPtr, char *string,
!                                          Tcl_Encoding encoding) NS_GNUC_DEPRECATED;
  NS_EXTERN char *Ns_EncodeUrlCharset(Ns_DString *dsPtr, char *string,
!                                     char *charset) NS_GNUC_DEPRECATED;
  NS_EXTERN char *Ns_DecodeUrlCharset(Ns_DString *dsPtr, char *string,
!                                     char *charset) NS_GNUC_DEPRECATED;
  
  /*

Index: nsthread.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/nsthread.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** nsthread.h	10 Jun 2005 07:29:19 -0000	1.4
--- nsthread.h	10 Jun 2005 19:18:07 -0000	1.5
***************
*** 198,207 ****
   */
  
! NS_EXTERN void *ns_malloc(size_t size);
! NS_EXTERN void *ns_calloc(size_t num, size_t size);
  NS_EXTERN void ns_free(void *buf);
  NS_EXTERN void *ns_realloc(void *buf, size_t size);
! NS_EXTERN char *ns_strdup(const char *string);
! NS_EXTERN char *ns_strcopy(const char *string);
  
  /*
--- 198,207 ----
   */
  
! NS_EXTERN void *ns_malloc(size_t size) NS_GNUC_MALLOC;
! NS_EXTERN void *ns_calloc(size_t num, size_t size) NS_GNUC_MALLOC;
  NS_EXTERN void ns_free(void *buf);
  NS_EXTERN void *ns_realloc(void *buf, size_t size);
! NS_EXTERN char *ns_strdup(const char *string) NS_GNUC_MALLOC;
! NS_EXTERN char *ns_strcopy(const char *string) NS_GNUC_MALLOC;
  
  /*