Diff for /include/ldap_log.h between versions 1.22 and 1.37

version 1.22, 2000/10/17 22:33:56 version 1.37, 2005/12/22 21:33:32
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/include/ldap_log.h,v 1.21 2000/10/17 17:37:01 gwilliams Exp $ */  /* $OpenLDAP: pkg/ldap/include/ldap_log.h,v 1.36 2005/01/01 19:49:42 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-2005 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 29 Line 32
 LDAP_BEGIN_DECL  LDAP_BEGIN_DECL
   
 /*  /*
  * While it's not important that the subsystem number are  
  * contiguous, it is important that the LDAP_SUBSYS_NUM accurately  
  * reflect the number of subsystems and LDAP_SUBSYS_MAX reflect  
  * the largest subsystem number.  
  */  
 #define LDAP_SUBSYS_NUM 12  
 #define LDAP_SUBSYS_MAX 11  
   
 #define LDAP_SUBSYS_GLOBAL      0  
 #define LDAP_SUBSYS_OPERATION   1  
 #define LDAP_SUBSYS_TRANSPORT   2  
 #define LDAP_SUBSYS_CONNECTION  3  
 #define LDAP_SUBSYS_FILTER      4  
 #define LDAP_SUBSYS_BACKEND     5  
 #define LDAP_SUBSYS_BER         6  
 #define LDAP_SUBSYS_CONFIG      7  
 #define LDAP_SUBSYS_ACL         8  
 #define LDAP_SUBSYS_CACHE       9  
 #define LDAP_SUBSYS_INDEX      10  
 #define LDAP_SUBSYS_LDIF       11  
   
 /*  
  * debug reporting levels.   * debug reporting levels.
  *   *
  * They start with the syslog levels, and   * They start with the syslog levels, and
Line 83  LDAP_BEGIN_DECL Line 64  LDAP_BEGIN_DECL
 #define LDAP_DEBUG_STATS2       0x0200  #define LDAP_DEBUG_STATS2       0x0200
 #define LDAP_DEBUG_SHELL        0x0400  #define LDAP_DEBUG_SHELL        0x0400
 #define LDAP_DEBUG_PARSE        0x0800  #define LDAP_DEBUG_PARSE        0x0800
 #define LDAP_DEBUG_CACHE    0x1000  #if 0 /* no longer used (nor supported) */
 #define LDAP_DEBUG_INDEX    0x2000  #define LDAP_DEBUG_CACHE        0x1000
   #define LDAP_DEBUG_INDEX        0x2000
   #endif
   #define LDAP_DEBUG_SYNC         0x4000
   
 #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.
Line 104  LDAP_BEGIN_DECL Line 86  LDAP_BEGIN_DECL
 #   ifdef LDAP_SYSLOG  #   ifdef LDAP_SYSLOG
     extern int  ldap_syslog;      extern int  ldap_syslog;
     extern int  ldap_syslog_level;      extern int  ldap_syslog_level;
   
   #       ifdef HAVE_EBCDIC
   #       define syslog   eb_syslog
           extern void eb_syslog(int pri, const char *fmt, ...);
   #       endif
   
 #   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 { \
                   if ( ldap_debug & (level) ) \
                           lutil_debug( ldap_debug, (level), (fmt), (arg1), (arg2), (arg3) ); \
           } while ( 0 )
 #   endif  #   endif
   
 #ifndef LDAP_LOG  
 #   define LDAP_LOG(a) lutil_log a  
 #endif  
   
 #else /* LDAP_DEBUG */  #else /* LDAP_DEBUG */
 #   define Debug( level, fmt, arg1, arg2, arg3 )  #   define Debug( level, fmt, arg1, arg2, arg3 )
   
 #ifndef LDAP_LOG  
 #   define LDAP_LOG(a)  
 #endif  
   
 #endif /* LDAP_DEBUG */  #endif /* LDAP_DEBUG */
   
   #ifndef LDAP_LOG
 LDAP_LUTIL_F(int) lutil_mnem2level LDAP_P(( char *level ));  #define LDAP_LOG(a, b, fmt, arg1, arg2, arg3)
 LDAP_LUTIL_F(void) lutil_log_initialize(int argc, char **argv);  #define LDAP_LOGS_TEST(a, b) 0
 LDAP_LUTIL_F(void) lutil_set_debug_level LDAP_P(( char *subsys, int level ));  #endif
 LDAP_LUTIL_F(void) lutil_log LDAP_P(( char *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 ));
   
   
 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)));

Removed from v.1.22  
changed lines
  Added in v.1.37


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