Diff for /include/ldap_log.h between versions 1.29 and 1.29.2.5

version 1.29, 2003/01/03 19:20:50 version 1.29.2.5, 2004/02/23 22:08:05
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/include/ldap_log.h,v 1.28 2002/09/18 22:58:51 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/include/ldap_log.h,v 1.29.2.4 2004/01/01 18:16:28 kurt Exp $ */
 /*  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  * Copyright 1998-2003 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, with or without   * Redistribution and use in source and binary forms, with or without
  * modification, are permitted only as authorized by the OpenLDAP   * modification, are permitted only as authorized by the OpenLDAP
  * Public License.  A copy of this license is available at   * Public License.
  * http://www.OpenLDAP.org/license.html or 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 112  LDAP_BEGIN_DECL Line 114  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 */
Line 139  LDAP_BEGIN_DECL Line 147  LDAP_BEGIN_DECL
   
 #ifdef NEW_LOGGING  #ifdef NEW_LOGGING
 extern int ldap_loglevels[LDAP_SUBSYS_NUM];  extern int ldap_loglevels[LDAP_SUBSYS_NUM];
   
   #ifdef LDAP_DEBUG
   
 #define LDAP_LOG(a, b, fmt, arg1, arg2, arg3) do {\  #define LDAP_LOG(a, b, fmt, arg1, arg2, arg3) do {\
         if (ldap_loglevels[LDAP_SUBSYS_##a] >= LDAP_LEVEL_##b || \          if (ldap_loglevels[LDAP_SUBSYS_##a] >= LDAP_LEVEL_##b || \
                 ldap_loglevels[LDAP_SUBSYS_GLOBAL] >= LDAP_LEVEL_##b)\                  ldap_loglevels[LDAP_SUBSYS_GLOBAL] >= LDAP_LEVEL_##b)\
Line 150  extern int ldap_loglevels[LDAP_SUBSYS_NU Line 161  extern int ldap_loglevels[LDAP_SUBSYS_NU
         (ldap_loglevels[LDAP_SUBSYS_##a] >= LDAP_LEVEL_##b || \          (ldap_loglevels[LDAP_SUBSYS_##a] >= LDAP_LEVEL_##b || \
          ldap_loglevels[LDAP_SUBSYS_GLOBAL] >= LDAP_LEVEL_##b)           ldap_loglevels[LDAP_SUBSYS_GLOBAL] >= LDAP_LEVEL_##b)
   
 #endif /* LDAP_LOG */  #endif /* LDAP_DEBUG */
   
   #endif /* NEW_LOGGING */
   
 #ifndef LDAP_LOG  #ifndef LDAP_LOG
 #define LDAP_LOG(a, b, fmt, arg1, arg2, arg3)  #define LDAP_LOG(a, b, fmt, arg1, arg2, arg3)
   #define LDAP_LOGS_TEST(a, b) 0
 #endif  #endif
   
 LDAP_LUTIL_F(int) lutil_mnem2level LDAP_P(( const char *level ));  LDAP_LUTIL_F(int) lutil_mnem2level LDAP_P(( const char *level ));

Removed from v.1.29  
changed lines
  Added in v.1.29.2.5


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