Diff for /include/ldap_log.h between versions 1.3 and 1.48

version 1.3, 1998/12/22 00:34:02 version 1.48, 2009/10/30 16:43:52
Line 1 Line 1
 /*  /* $OpenLDAP: pkg/ldap/include/ldap_log.h,v 1.47 2009/10/06 20:03:15 ando Exp $ */
  * Copyright (c) 1990 Regents of the University of Michigan.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
    * 
    * Copyright 1998-2009 The OpenLDAP Foundation.
    * All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted only as authorized by the OpenLDAP
    * Public License.
    *
    * 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 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 10 Line 23
  * is provided ``as is'' without express or implied warranty.   * is provided ``as is'' without express or implied warranty.
  */   */
   
 #ifndef _LDAP_LOG_H  #ifndef LDAP_LOG_H
 #define _LDAP_LOG_H  #define LDAP_LOG_H
   
   #include <stdio.h>
 #include <ldap_cdefs.h>  #include <ldap_cdefs.h>
   
 LDAP_BEGIN_DECL  LDAP_BEGIN_DECL
   
 /* debugging stuff */  /*
 #ifdef LDAP_DEBUG   * debug reporting levels.
    *
    * They start with the syslog levels, and
    * go down in importance.  The normal
    * debugging levels begin with LDAP_LEVEL_ENTRY
    *
    */
   
 #ifndef ldap_debug  /*
 extern int      ldap_debug;   * The "OLD_DEBUG" means that all logging occurs at LOG_DEBUG
 #endif /* !ldap_debug */   */
   
 #ifdef LDAP_SYSLOG  #ifdef OLD_DEBUG
 extern int      ldap_syslog;  /* original behavior: all logging occurs at the same severity level */
 extern int      ldap_syslog_level;  #if defined(LDAP_DEBUG) && defined(LDAP_SYSLOG)
 #endif /* LDAP_SYSLOG */  #define LDAP_LEVEL_EMERG        ldap_syslog_level
   #define LDAP_LEVEL_ALERT        ldap_syslog_level
   #define LDAP_LEVEL_CRIT         ldap_syslog_level
   #define LDAP_LEVEL_ERR          ldap_syslog_level
   #define LDAP_LEVEL_WARNING      ldap_syslog_level
   #define LDAP_LEVEL_NOTICE       ldap_syslog_level
   #define LDAP_LEVEL_INFO         ldap_syslog_level
   #define LDAP_LEVEL_DEBUG        ldap_syslog_level
   #else /* !LDAP_DEBUG || !LDAP_SYSLOG */
   #define LDAP_LEVEL_EMERG        (7)
   #define LDAP_LEVEL_ALERT        (7)
   #define LDAP_LEVEL_CRIT         (7)
   #define LDAP_LEVEL_ERR          (7)
   #define LDAP_LEVEL_WARNING      (7)
   #define LDAP_LEVEL_NOTICE       (7)
   #define LDAP_LEVEL_INFO         (7)
   #define LDAP_LEVEL_DEBUG        (7)
   #endif /* !LDAP_DEBUG || !LDAP_SYSLOG */
   
   #else /* ! OLD_DEBUG */
   /* map syslog onto LDAP severity levels */
   #ifdef LOG_DEBUG
   #define LDAP_LEVEL_EMERG        LOG_EMERG
   #define LDAP_LEVEL_ALERT        LOG_ALERT
   #define LDAP_LEVEL_CRIT         LOG_CRIT
   #define LDAP_LEVEL_ERR          LOG_ERR
   #define LDAP_LEVEL_WARNING      LOG_WARNING
   #define LDAP_LEVEL_NOTICE       LOG_NOTICE
   #define LDAP_LEVEL_INFO         LOG_INFO
   #define LDAP_LEVEL_DEBUG        LOG_DEBUG
   #else /* ! LOG_DEBUG */
   #define LDAP_LEVEL_EMERG        (0)
   #define LDAP_LEVEL_ALERT        (1)
   #define LDAP_LEVEL_CRIT         (2)
   #define LDAP_LEVEL_ERR          (3)
   #define LDAP_LEVEL_WARNING      (4)
   #define LDAP_LEVEL_NOTICE       (5)
   #define LDAP_LEVEL_INFO         (6)
   #define LDAP_LEVEL_DEBUG        (7)
   #endif /* ! LOG_DEBUG */
   #endif /* ! OLD_DEBUG */
   #if 0
   /* in case we need to reuse the unused bits of severity */
   #define LDAP_LEVEL_MASK(s)      ((s) & 0x7)
   #else
   #define LDAP_LEVEL_MASK(s)      (s)
   #endif
   
   /* (yet) unused */
   #define LDAP_LEVEL_ENTRY        (0x08)  /* log function entry points */
   #define LDAP_LEVEL_ARGS         (0x10)  /* log function call parameters */
   #define LDAP_LEVEL_RESULTS      (0x20)  /* Log function results */
   #define LDAP_LEVEL_DETAIL1      (0x40)  /* log level 1 function operational details */
   #define LDAP_LEVEL_DETAIL2      (0x80)  /* Log level 2 function operational details */
   /* end of (yet) unused */
   
   /* original subsystem selection mechanism */
 #define LDAP_DEBUG_TRACE        0x0001  #define LDAP_DEBUG_TRACE        0x0001
 #define LDAP_DEBUG_PACKETS      0x0002  #define LDAP_DEBUG_PACKETS      0x0002
 #define LDAP_DEBUG_ARGS         0x0004  #define LDAP_DEBUG_ARGS         0x0004
Line 41  extern int ldap_syslog_level; Line 116  extern int ldap_syslog_level;
 #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
   #if 0 /* no longer used (nor supported) */
   #define LDAP_DEBUG_CACHE        0x1000
   #define LDAP_DEBUG_INDEX        0x2000
   #endif
   #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 */
   #ifdef LDAP_DEBUG
       /*
        * This is a bogus extern declaration for the compiler. No need to ensure
        * a 'proper' dllimport.
        */
   #ifndef ldap_debug
   extern int      ldap_debug;
   #endif /* !ldap_debug */
   
   #ifdef LDAP_SYSLOG
   extern int      ldap_syslog;
   extern int      ldap_syslog_level;
   
   #ifdef HAVE_EBCDIC
   #define syslog  eb_syslog
   extern void eb_syslog(int pri, const char *fmt, ...);
   #endif /* HAVE_EBCDIC */
   
   #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 LogTest(level) ( ( ldap_debug | ldap_syslog ) & (level) )
   #define LogExpand(level, severity, args) \
           do { \
                 if ( ldap_debug & (level) ) \                  if ( ldap_debug & (level) ) \
                         fprintf( stderr, (fmt), (arg1), (arg2), (arg3) ); \                          lutil_debug( ldap_debug, (level), args ); \
                 if ( ldap_syslog & level ) \                  if ( ldap_syslog & (level) ) \
                         syslog( ldap_syslog_level, (fmt), (arg1), (arg2), (arg3) ); \                          syslog( LDAP_LEVEL_MASK((severity)), args ); \
         }          } while ( 0 )
 #else /* LDAP_SYSLOG */  
 #ifndef WINSOCK  #else /* ! LDAP_SYSLOG */
 #define Debug( level, fmt, arg1, arg2, arg3 ) \  
   #define LogTest(level) ( ldap_debug & (level) )
   #define LogExpand(level, severity, args) \
           do { \
                 if ( ldap_debug & (level) ) \                  if ( ldap_debug & (level) ) \
                         fprintf( stderr, (fmt), (arg1), (arg2), (arg3) );                          lutil_debug( ldap_debug, (level), args ); \
 #else /* !WINSOCK */          } while ( 0 )
 extern void Debug( int level, char* fmt, ... );  
 #endif /* !WINSOCK */  #endif /* ! LDAP_SYSLOG */
 #endif /* LDAP_SYSLOG */  #else /* ! LDAP_DEBUG */
 #else /* LDAP_DEBUG */  
 #define Debug( level, fmt, arg1, arg2, arg3 )  /* TODO: in case LDAP_DEBUG is undefined, make sure logs with appropriate
 #endif /* LDAP_DEBUG */   * severity gets thru anyway */
   #define LogTest(level) ( 0 )
   #define LogExpand(level, severity, args) ((void) 0)
   
   #endif /* ! LDAP_DEBUG */
   
   #define LogArg ,
   #define Log0(level, severity, fmt) \
           LogExpand((level), (severity), (fmt))
   #define Log1(level, severity, fmt, a1) \
           LogExpand((level), (severity), (fmt) LogArg(a1))
   #define Log2(level, severity, fmt, a1, a2) \
           LogExpand((level), (severity), (fmt) LogArg(a1) LogArg(a2))
   #define Log3(level, severity, fmt, a1, a2, a3) \
           LogExpand((level), (severity), (fmt) LogArg(a1) LogArg(a2) LogArg(a3))
   #define Log4(level, severity, fmt, a1, a2, a3, a4) \
           LogExpand((level), (severity), (fmt) LogArg(a1) LogArg(a2) LogArg(a3) \
                   LogArg(a4))
   #define Log5(level, severity, fmt, a1, a2, a3, a4, a5) \
           LogExpand((level), (severity), (fmt) LogArg(a1) LogArg(a2) LogArg(a3) \
                   LogArg(a4) LogArg(a5))
   #define Debug(level, fmt, a1, a2, a3) \
           LogExpand((level), ldap_syslog_level, (fmt) \
                   LogArg(a1) LogArg(a2) LogArg(a3))
   
   LDAP_LUTIL_F(int) lutil_debug_file LDAP_P(( FILE *file ));
   
   LDAP_LUTIL_F(void) lutil_debug LDAP_P((
           int debug, int level,
           const char* fmt, ... )) LDAP_GCCATTR((format(printf, 3, 4)));
   
 LDAP_END_DECL  LDAP_END_DECL
   
 #endif /* _LDAP_LOG_H */  #endif /* LDAP_LOG_H */

Removed from v.1.3  
changed lines
  Added in v.1.48


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