Diff for /include/ldap_log.h between versions 1.40 and 1.40.2.10

version 1.40, 2006/01/03 22:12:06 version 1.40.2.10, 2011/01/26 18:32:52
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/include/ldap_log.h,v 1.39 2005/12/28 00:22:56 ando Exp $ */  /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *    * 
  * Copyright 1998-2006 The OpenLDAP Foundation.   * Copyright 1998-2011 The OpenLDAP Foundation.
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
Line 123  LDAP_BEGIN_DECL Line 123  LDAP_BEGIN_DECL
 #define LDAP_DEBUG_SYNC         0x4000  #define LDAP_DEBUG_SYNC         0x4000
   
 #define LDAP_DEBUG_NONE         0x8000  #define LDAP_DEBUG_NONE         0x8000
 #define LDAP_DEBUG_ANY          -1  #define LDAP_DEBUG_ANY          (-1)
   
 /* debugging stuff */  /* debugging stuff */
 #ifdef LDAP_DEBUG  #ifdef LDAP_DEBUG
Line 226  extern void eb_syslog(int pri, const cha Line 226  extern void eb_syslog(int pri, const cha
                         lutil_debug( ldap_debug, (level), (fmt), (arg1), (arg2), (arg3), (arg4), (arg5) ); \                          lutil_debug( ldap_debug, (level), (fmt), (arg1), (arg2), (arg3), (arg4), (arg5) ); \
         } while ( 0 )          } while ( 0 )
 #define Debug( level, fmt, arg1, arg2, arg3 ) \  #define Debug( level, fmt, arg1, arg2, arg3 ) \
                 Log3( (level), (fmt), (arg1), (arg2), (arg3) )                  Log3( (level), 0, (fmt), (arg1), (arg2), (arg3) )
 #define LogTest(level) ( ldap_debug & (level) )  #define LogTest(level) ( ldap_debug & (level) )
 #endif /* ! LDAP_SYSLOG */  #endif /* ! LDAP_SYSLOG */
 #else /* ! LDAP_DEBUG */  #else /* ! LDAP_DEBUG */
 /* TODO: in case LDAP_DEBUG is undefined, make sure logs with appropriate  /* TODO: in case LDAP_DEBUG is undefined, make sure logs with appropriate
  * severity gets thru anyway */   * severity gets thru anyway */
 #define Log0( level, severity, fmt )  #define Log0( level, severity, fmt ) ((void)0)
 #define Log1( level, severity, fmt, arg1 )  #define Log1( level, severity, fmt, arg1 ) ((void)0)
 #define Log2( level, severity, fmt, arg1, arg2 )  #define Log2( level, severity, fmt, arg1, arg2 ) ((void)0)
 #define Log3( level, severity, fmt, arg1, arg2, arg3 )  #define Log3( level, severity, fmt, arg1, arg2, arg3 ) ((void)0)
 #define Log4( level, severity, fmt, arg1, arg2, arg3, arg4 )  #define Log4( level, severity, fmt, arg1, arg2, arg3, arg4 ) ((void)0)
 #define Log5( level, severity, fmt, arg1, arg2, arg3, arg4, arg5 )  #define Log5( level, severity, fmt, arg1, arg2, arg3, arg4, arg5 ) ((void)0)
 #define Debug( level, fmt, arg1, arg2, arg3 )  #define Debug( level, fmt, arg1, arg2, arg3 ) ((void)0)
 #define LogTest(level) ( 0 )  #define LogTest(level) ( 0 )
 #endif /* ! LDAP_DEBUG */  #endif /* ! LDAP_DEBUG */
   
   /* Actually now in liblber/debug.c */
 LDAP_LUTIL_F(int) lutil_debug_file LDAP_P(( FILE *file ));  LDAP_LUTIL_F(int) lutil_debug_file LDAP_P(( FILE *file ));
   
 LDAP_LUTIL_F(void) lutil_debug LDAP_P((  LDAP_LUTIL_F(void) lutil_debug LDAP_P((
         int debug, int level,          int debug, int level,
         const char* fmt, ... )) LDAP_GCCATTR((format(printf, 3, 4)));          const char* fmt, ... )) LDAP_GCCATTR((format(printf, 3, 4)));
   
   #ifdef LDAP_DEFINE_LDAP_DEBUG
   /* This struct matches the head of ldapoptions in <ldap-int.h> */
   struct ldapoptions_prefix {
           short   ldo_valid;
           int             ldo_debug;
   };
   #define ldap_debug \
           (*(int *) ((char *)&ldap_int_global_options \
                    + offsetof(struct ldapoptions_prefix, ldo_debug)))
   
   struct ldapoptions;
   LDAP_V ( struct ldapoptions ) ldap_int_global_options;
   #endif /* LDAP_DEFINE_LDAP_DEBUG */
   
 LDAP_END_DECL  LDAP_END_DECL
   
 #endif /* LDAP_LOG_H */  #endif /* LDAP_LOG_H */

Removed from v.1.40  
changed lines
  Added in v.1.40.2.10


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org