Diff for /include/ldap_log.h between versions 1.19 and 1.32

version 1.19, 2000/10/12 18:01:12 version 1.32, 2004/01/01 18:15:24
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/include/ldap_log.h,v 1.18 2000/06/18 17:48:08 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/include/ldap_log.h,v 1.31 2003/11/26 06:16:36 kurt Exp $ */
 /*  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA   * 
    * Copyright 1998-2004 The OpenLDAP Foundation.
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms are permitted only   * Redistribution and use in source and binary forms, with or without
  * as authorized by the OpenLDAP Public License.  A copy of this   * modification, are permitted only as authorized by the OpenLDAP
  * license is available at http://www.OpenLDAP.org/license.html or   * Public License.
  * in file LICENSE in the top-level directory of the distribution.   *
    * A copy of this license is available in file LICENSE in the
    * top-level directory of the distribution or, alternatively, at
    * <http://www.OpenLDAP.org/license.html>.
  */   */
 /* Portions  /* Portions Copyright (c) 1990 Regents of the University of Michigan.
  * Copyright (c) 1990 Regents of the University of Michigan.  
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms are permitted   * Redistribution and use in source and binary forms are permitted
Line 30  LDAP_BEGIN_DECL Line 33  LDAP_BEGIN_DECL
   
 /*  /*
  * While it's not important that the subsystem number are   * While it's not important that the subsystem number are
  * contiguous, it is important that the NUM_SUBSYS accurately   * contiguous, it is important that the LDAP_SUBSYS_NUM accurately
  * reflect the number of subsystems and MAX_SUBSYS reflect   * reflect the number of subsystems and LDAP_SUBSYS_MAX reflect
  * the largest subsystem number.   * the largest subsystem number.
  */   */
 #define NUM_SUBSYS 12  #define LDAP_SUBSYS_NUM 20
 #define MAX_SUBSYS 11  #define LDAP_SUBSYS_MAX 19
   
 #define LDAP_SUBSYS_GLOBAL      0  #define LDAP_SUBSYS_GLOBAL      0
 #define LDAP_SUBSYS_OPERATION   1  #define LDAP_SUBSYS_OPERATION   1
 #define LDAP_SUBSYS_TRANSPORT   2  #define LDAP_SUBSYS_TRANSPORT   2
 #define LDAP_SUBSYS_CONNECTION  3  #define LDAP_SUBSYS_CONNECTION  3
 #define LDAP_SUBSYS_FILTER      4  #define LDAP_SUBSYS_FILTER      4
 #define LDAP_SUBSYS_BACKEND     5  #define LDAP_SUBSYS_BER         5
 #define LDAP_SUBSYS_BER         6  #define LDAP_SUBSYS_CONFIG      6
 #define LDAP_SUBSYS_CONFIG      7  #define LDAP_SUBSYS_ACL         7
 #define LDAP_SUBSYS_ACL         8  #define LDAP_SUBSYS_CACHE       8
 #define LDAP_SUBSYS_CACHE       9  #define LDAP_SUBSYS_INDEX       9
 #define LDAP_SUBSYS_INDEX      10  #define LDAP_SUBSYS_LDIF        10
 #define LDAP_SUBSYS_LDIF       11  #define LDAP_SUBSYS_TOOLS       11
   #define LDAP_SUBSYS_SLAPD       12
   #define LDAP_SUBSYS_SLURPD      13
   #define LDAP_SUBSYS_BACKEND     14
   #define LDAP_SUBSYS_BACK_BDB    15
   #define LDAP_SUBSYS_BACK_LDBM   16
   #define LDAP_SUBSYS_BACK_LDAP   17
   #define LDAP_SUBSYS_BACK_META   18
   #define LDAP_SUBSYS_BACK_MON    19
   
 /*  /*
  * debug reporting levels.   * debug reporting levels.
Line 86  LDAP_BEGIN_DECL Line 97  LDAP_BEGIN_DECL
 #define LDAP_DEBUG_CACHE    0x1000  #define LDAP_DEBUG_CACHE    0x1000
 #define LDAP_DEBUG_INDEX    0x2000  #define LDAP_DEBUG_INDEX    0x2000
   
 #define LDAP_DEBUG_DEPRECATED   0x1000  
 #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
   
 /*      /*
  * This is a bogus extern declaration for the compiler. No need to ensure       * This is a bogus extern declaration for the compiler. No need to ensure
  * a 'proper' dllimport.       * a 'proper' dllimport.
  */       */
 #ifndef ldap_debug  #   ifndef ldap_debug
 extern int      ldap_debug;       extern int ldap_debug;
 #endif /* !ldap_debug */  #   endif /* !ldap_debug */
   
 #ifdef LDAP_SYSLOG  #   ifdef LDAP_SYSLOG
 extern int      ldap_syslog;      extern int  ldap_syslog;
 extern int      ldap_syslog_level;      extern int  ldap_syslog_level;
 #endif /* LDAP_SYSLOG */  #   endif /* LDAP_SYSLOG */
   
 /* this doesn't below as part of ldap.h */  /* this doesn't below as part of ldap.h */
 #ifdef LDAP_SYSLOG  #   ifdef LDAP_SYSLOG
 #define Debug( level, fmt, arg1, arg2, arg3 )   \  #   define Debug( level, fmt, arg1, arg2, arg3 )        \
         do { \          do { \
                 lutil_debug( ldap_debug, (level), (fmt), (arg1), (arg2), (arg3) ); \                  if ( ldap_debug & (level) ) \
                           lutil_debug( ldap_debug, (level), (fmt), (arg1), (arg2), (arg3) ); \
                 if ( ldap_syslog & (level) ) \                  if ( ldap_syslog & (level) ) \
                         syslog( ldap_syslog_level, (fmt), (arg1), (arg2), (arg3) ); \                          syslog( ldap_syslog_level, (fmt), (arg1), (arg2), (arg3) ); \
         } while ( 0 )          } while ( 0 )
   
 #else  #   else
 #define Debug( level, fmt, arg1, arg2, arg3 ) \  #       define Debug( level, fmt, arg1, arg2, arg3 ) \
         lutil_debug( ldap_debug, (level), (fmt), (arg1), (arg2), (arg3) )          do { \
 #endif                  if ( ldap_debug & (level) ) \
                           lutil_debug( ldap_debug, (level), (fmt), (arg1), (arg2), (arg3) ); \
           } while ( 0 )
   #   endif
   
 #else /* LDAP_DEBUG */  #else /* LDAP_DEBUG */
 #define Debug( level, fmt, arg1, arg2, arg3 )  #   define Debug( level, fmt, arg1, arg2, arg3 )
   
 #endif /* LDAP_DEBUG */  #endif /* LDAP_DEBUG */
   
   #ifdef NEW_LOGGING
   extern int ldap_loglevels[LDAP_SUBSYS_NUM];
   
 #define LDAP_LOG(a) lutil_log a  #ifdef LDAP_DEBUG
   
   #define LDAP_LOG(a, b, fmt, arg1, arg2, arg3) do {\
           if (ldap_loglevels[LDAP_SUBSYS_##a] >= LDAP_LEVEL_##b || \
                   ldap_loglevels[LDAP_SUBSYS_GLOBAL] >= LDAP_LEVEL_##b)\
                      lutil_log (LDAP_SUBSYS_##a, LDAP_LEVEL_##b, fmt, arg1, arg2, arg3); \
           } while (0)
   
   
   #define LDAP_LOGS_TEST(a, b) \
           (ldap_loglevels[LDAP_SUBSYS_##a] >= LDAP_LEVEL_##b || \
            ldap_loglevels[LDAP_SUBSYS_GLOBAL] >= LDAP_LEVEL_##b)
   
   #endif /* LDAP_DEBUG */
   
   #endif /* NEW_LOGGING */
   
   #ifndef LDAP_LOG
   #define LDAP_LOG(a, b, fmt, arg1, arg2, arg3)
   #define LDAP_LOGS_TEST(a, b) 0
   #endif
   
 LDAP_LUTIL_F(void) lutil_log_initialize(int argc, char **argv);  LDAP_LUTIL_F(int) lutil_mnem2level LDAP_P(( const char *level ));
 LDAP_LUTIL_F(void) lutil_set_debug_level LDAP_P(( char *subsys, int level ));  LDAP_LUTIL_F(void) lutil_log_initialize LDAP_P((
 LDAP_LUTIL_F(void) lutil_log LDAP_P(( char *subsys, int level, const char *fmt, ... ));          int argc, char **argv ));
 /*LDAP_LUTIL_F(void) lutil_log_int LDAP_P(( FILE* file, char *subsys, int level, const char *fmt, va_list vl ));*/  LDAP_LUTIL_F(int) lutil_set_debug_level LDAP_P((
           const char *subsys, int level ));
   LDAP_LUTIL_F(void) lutil_log LDAP_P((
           const int subsys, int level, const char *fmt, ... ));
   
 LDAP_LUTIL_F(int) lutil_debug_file LDAP_P(( FILE *file ));  LDAP_LUTIL_F(int) lutil_debug_file LDAP_P(( FILE *file ));
   

Removed from v.1.19  
changed lines
  Added in v.1.32


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