[naviserver-commits] naviserver/include ns.h,1.65,1.66

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

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

Modified Files:
	ns.h 
Log Message:
2005-12-30  Stephen Deasey  <sd...@us...>

        * include/ns.h:
        * nsd/init.c:
        * nsd/urlspace.c:
        * tests/url2file.test: Split the urlspace by key ID and remove the
        global lock. Remove unused Ns_ServerSpecific*() routines.

        Make NsUrlSpecificWalk() emit an entry for both inherit and
        noinherit data, identifying each with a keyword.  Don't emit the
        server name, which is redundant, and separate the URL from the
        filter. (RFE: 1377113)


Index: ns.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/ns.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** ns.h	30 Dec 2005 11:07:33 -0000	1.65
--- ns.h	30 Dec 2005 11:26:42 -0000	1.66
***************
*** 1930,1961 ****
  NS_EXTERN void
  Ns_UrlSpecificSet(CONST char *server, CONST char *method, CONST char *url, int id,
!                   void *data, int flags, void (*deletefunc)(void *));
  
  NS_EXTERN void *
! Ns_UrlSpecificGet(CONST char *server, CONST char *method, CONST char *url, int id);
  
  NS_EXTERN void *
! Ns_UrlSpecificGetFast(CONST char *server, CONST char *method, CONST char *url, int id);
  
  NS_EXTERN void *
  Ns_UrlSpecificGetExact(CONST char *server, CONST char *method, CONST char *url,
!                        int id, int flags);
  
  NS_EXTERN void *
  Ns_UrlSpecificDestroy(CONST char *server, CONST char *method, CONST char *url,
!                       int id, int flags);
! 
! NS_EXTERN int
! Ns_ServerSpecificAlloc(void);
! 
! NS_EXTERN void
! Ns_ServerSpecificSet(CONST char *handle, int id, void *data, int flags,
!                      void (*deletefunc)(void *));
! 
! NS_EXTERN void *
! Ns_ServerSpecificGet(CONST char *handle, int id);
! 
! NS_EXTERN void *
! Ns_ServerSpecificDestroy(CONST char *handle, int id, int flags);
  
  /*
--- 1930,1953 ----
  NS_EXTERN void
  Ns_UrlSpecificSet(CONST char *server, CONST char *method, CONST char *url, int id,
!                   void *data, int flags, void (*deletefunc)(void *))
!     NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2) NS_GNUC_NONNULL(3) NS_GNUC_NONNULL(5);
  
  NS_EXTERN void *
! Ns_UrlSpecificGet(CONST char *server, CONST char *method, CONST char *url, int id)
!     NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2) NS_GNUC_NONNULL(3);
  
  NS_EXTERN void *
! Ns_UrlSpecificGetFast(CONST char *server, CONST char *method, CONST char *url, int id)
!     NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2) NS_GNUC_NONNULL(3);
  
  NS_EXTERN void *
  Ns_UrlSpecificGetExact(CONST char *server, CONST char *method, CONST char *url,
!                        int id, int flags)
!     NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2) NS_GNUC_NONNULL(3);
  
  NS_EXTERN void *
  Ns_UrlSpecificDestroy(CONST char *server, CONST char *method, CONST char *url,
!                       int id, int flags)
!     NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2) NS_GNUC_NONNULL(3);
  
  /*