Fix prev commit

[openldap] / include / ldap_log.h

diff --git a/include/ldap_log.h b/include/ldap_log.h
index 41ec5c9174d807cbed53ae291fd327e14a2d6dcd..2733fc983a5e89e8ac19de347eb7e8ee62b91a95 100644 (file)
--- a/include/ldap_log.h
+++ b/include/ldap_log.h
@@ -1,15 +1,18 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ * 
+ * Copyright 1998-2008 The OpenLDAP Foundation.
  * 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.
+ * 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.
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -28,28 +31,6 @@
 
 LDAP_BEGIN_DECL
 
-/*
- * While it's not important that the subsystem number are
- * contiguous, it is important that the NUM_SUBSYS accurately
- * reflect the number of subsystems and MAX_SUBSYS reflect
- * the largest subsystem number.
- */
-#define NUM_SUBSYS 12
-#define MAX_SUBSYS 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.
  *
@@ -85,56 +66,62 @@ LDAP_BEGIN_DECL
 #define LDAP_DEBUG_PARSE       0x0800
 #define LDAP_DEBUG_CACHE    0x1000
 #define LDAP_DEBUG_INDEX    0x2000
+#define LDAP_DEBUG_SYNC                0x4000
 
-#define LDAP_DEBUG_DEPRECATED  0x1000
 #define LDAP_DEBUG_NONE                0x8000
 #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 */
 
-/*
- * 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
 
-#ifdef LDAP_SYSLOG
-extern int     ldap_syslog;
-extern int     ldap_syslog_level;
-#endif /* LDAP_SYSLOG */
+#   endif /* LDAP_SYSLOG */
 
 /* this doesn't below as part of ldap.h */
-#ifdef LDAP_SYSLOG
-#define Debug( level, fmt, arg1, arg2, arg3 )  \
+#   ifdef LDAP_SYSLOG
+#   define Debug( level, fmt, arg1, arg2, arg3 )       \
        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) ) \
                        syslog( ldap_syslog_level, (fmt), (arg1), (arg2), (arg3) ); \
        } while ( 0 )
 
-#else
-#define Debug( level, fmt, arg1, arg2, arg3 ) \
-       lutil_debug( ldap_debug, (level), (fmt), (arg1), (arg2), (arg3) )
-#endif
+#   else
+#       define Debug( level, fmt, arg1, arg2, arg3 ) \
+       do { \
+               if ( ldap_debug & (level) ) \
+                       lutil_debug( ldap_debug, (level), (fmt), (arg1), (arg2), (arg3) ); \
+       } while ( 0 )
+#   endif
 
 #else /* LDAP_DEBUG */
-#define Debug( level, fmt, arg1, arg2, arg3 )
-#endif /* LDAP_DEBUG */
+#   define Debug( level, fmt, arg1, arg2, arg3 )
 
+#endif /* LDAP_DEBUG */
 
-#define LDAP_LOG(a) lutil_log a
-
-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(void) lutil_log_int LDAP_P(( FILE* file, char *subsys, int level, const char *fmt, va_list vl ));*/
+#ifndef LDAP_LOG
+#define LDAP_LOG(a, b, fmt, arg1, arg2, arg3)
+#define LDAP_LOGS_TEST(a, b) 0
+#endif
 
 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)));