[naviserver-commits] naviserver/include ns.h,1.45,1.46

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

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

Modified Files:
	ns.h 
Log Message:
        * include/ns.h:
        * nsd/nsd.h:
        * nsd/config.c: Add config value wrappers which handle defaults
        and in the case of integer values, range checking.


Index: ns.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/ns.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** ns.h	2 Aug 2005 03:51:22 -0000	1.45
--- ns.h	4 Aug 2005 04:52:12 -0000	1.46
***************
*** 629,646 ****
   */
  
  NS_EXTERN char *
! Ns_ConfigGetValue(CONST char *section, CONST char *key);
  
  NS_EXTERN char *
! Ns_ConfigGetValueExact(CONST char *section, CONST char *key);
  
  NS_EXTERN int
! Ns_ConfigGetInt(CONST char *section, CONST char *key, int *valuePtr);
  
  NS_EXTERN int
! Ns_ConfigGetInt64(CONST char *section, CONST char *key, ns_int64 *valuePtr);
  
  NS_EXTERN int
! Ns_ConfigGetBool(CONST char *section, CONST char *key, int *valuePtr);
  
  NS_EXTERN char *
--- 629,668 ----
   */
  
+ NS_EXTERN CONST char *
+ Ns_ConfigString(CONST char *section, CONST char *key, CONST char *def)
+      NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2);
+ 
+ NS_EXTERN int
+ Ns_ConfigBool(CONST char *section, CONST char *key, int def)
+      NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2);
+ 
+ NS_EXTERN int
+ Ns_ConfigInt(CONST char *section, CONST char *key, int def)
+      NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2);
+ 
+ NS_EXTERN int
+ Ns_ConfigIntRange(CONST char *section, CONST char *key, int def,
+                   int min, int max)
+      NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2);
+ 
  NS_EXTERN char *
! Ns_ConfigGetValue(CONST char *section, CONST char *key)
!      NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2);
  
  NS_EXTERN char *
! Ns_ConfigGetValueExact(CONST char *section, CONST char *key)
!      NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2);
  
  NS_EXTERN int
! Ns_ConfigGetInt(CONST char *section, CONST char *key, int *valuePtr)
!      NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2) NS_GNUC_NONNULL(3);
  
  NS_EXTERN int
! Ns_ConfigGetInt64(CONST char *section, CONST char *key, ns_int64 *valuePtr)
!      NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2) NS_GNUC_NONNULL(3);
  
  NS_EXTERN int
! Ns_ConfigGetBool(CONST char *section, CONST char *key, int *valuePtr)
!      NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2) NS_GNUC_NONNULL(3);
  
  NS_EXTERN char *