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

version 1.1, 1998/10/26 00:18:42 version 1.22, 2000/10/17 22:33:56
Line 1 Line 1
   /* $OpenLDAP: pkg/ldap/include/ldap_log.h,v 1.21 2000/10/17 17:37:01 gwilliams Exp $ */
 /*  /*
    * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
    * All rights reserved.
    *
    * Redistribution and use in source and binary forms are permitted only
    * as authorized by the OpenLDAP Public License.  A copy of this
    * license is available at http://www.OpenLDAP.org/license.html or
    * in file LICENSE in the top-level directory of the distribution.
    */
   /* 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.
  *   *
Line 13 Line 23
 #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
   
   /*
    * 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.
    *
    * They start with the syslog levels, and
    * go down in importance.  The normal
    * debugging levels begin with LDAP_LEVEL_ENTRY
    *
    */
   #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_ENTRY       7  /* log function entry points */
   #define LDAP_LEVEL_ARGS        8  /* log function call parameters */
   #define LDAP_LEVEL_RESULTS     9  /* Log function results */
   #define LDAP_LEVEL_DETAIL1    10  /* log level 1 function operational details */
   #define LDAP_LEVEL_DETAIL2    11  /* Log level 2 function operational details */
   
   #define LDAP_DEBUG_TRACE        0x0001
   #define LDAP_DEBUG_PACKETS      0x0002
   #define LDAP_DEBUG_ARGS         0x0004
   #define LDAP_DEBUG_CONNS        0x0008
   #define LDAP_DEBUG_BER          0x0010
   #define LDAP_DEBUG_FILTER       0x0020
   #define LDAP_DEBUG_CONFIG       0x0040
   #define LDAP_DEBUG_ACL          0x0080
   #define LDAP_DEBUG_STATS        0x0100
   #define LDAP_DEBUG_STATS2       0x0200
   #define LDAP_DEBUG_SHELL        0x0400
   #define LDAP_DEBUG_PARSE        0x0800
   #define LDAP_DEBUG_CACHE    0x1000
   #define LDAP_DEBUG_INDEX    0x2000
   
   #define LDAP_DEBUG_DEPRECATED   0x1000
   #define LDAP_DEBUG_NONE         0x8000
   #define LDAP_DEBUG_ANY          -1
   
 /* debugging stuff */  /* debugging stuff */
 #ifdef LDAP_DEBUG  #ifdef LDAP_DEBUG
 extern int      ldap_debug;  
 #ifdef LDAP_SYSLOG      /*
 extern int      ldap_syslog;       * This is a bogus extern declaration for the compiler. No need to ensure
 extern int      ldap_syslog_level;       * a 'proper' dllimport.
 #endif /* LDAP_SYSLOG */       */
   #   ifndef ldap_debug
 #define LDAP_DEBUG_TRACE        0x001       extern int ldap_debug;
 #define LDAP_DEBUG_PACKETS      0x002  #   endif /* !ldap_debug */
 #define LDAP_DEBUG_ARGS         0x004  
 #define LDAP_DEBUG_CONNS        0x008  #   ifdef LDAP_SYSLOG
 #define LDAP_DEBUG_BER          0x010      extern int  ldap_syslog;
 #define LDAP_DEBUG_FILTER       0x020      extern int  ldap_syslog_level;
 #define LDAP_DEBUG_CONFIG       0x040  #   endif /* LDAP_SYSLOG */
 #define LDAP_DEBUG_ACL          0x080  
 #define LDAP_DEBUG_STATS        0x100  
 #define LDAP_DEBUG_STATS2       0x200  
 #define LDAP_DEBUG_SHELL        0x400  
 #define LDAP_DEBUG_PARSE        0x800  
 #define LDAP_DEBUG_ANY          0xffff  
   
 /* 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 { \
                 if ( ldap_debug & (level) ) \                  lutil_debug( ldap_debug, (level), (fmt), (arg1), (arg2), (arg3) ); \
                         fprintf( stderr, (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 )
 #else /* LDAP_SYSLOG */  
 #ifndef WINSOCK  #   else
 #define Debug( level, fmt, arg1, arg2, arg3 ) \  #       define Debug( level, fmt, arg1, arg2, arg3 ) \
                 if ( ldap_debug & (level) ) \              lutil_debug( ldap_debug, (level), (fmt), (arg1), (arg2), (arg3) )
                         fprintf( stderr, (fmt), (arg1), (arg2), (arg3) );  #   endif
 #else /* !WINSOCK */  
 extern void Debug( int level, char* fmt, ... );  #ifndef LDAP_LOG
 #endif /* !WINSOCK */  #   define LDAP_LOG(a) lutil_log a
 #endif /* LDAP_SYSLOG */  #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 */
   
   
   LDAP_LUTIL_F(int) lutil_mnem2level LDAP_P(( char *level ));
   LDAP_LUTIL_F(void) lutil_log_initialize(int argc, char **argv);
   LDAP_LUTIL_F(void) lutil_set_debug_level LDAP_P(( char *subsys, int level ));
   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(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_H */  #endif /* _LDAP_LOG_H */

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


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