summaryrefslogtreecommitdiffstats
path: root/ldap/include
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2008-12-05 22:41:53 +0000
committerRich Megginson <rmeggins@redhat.com>2008-12-05 22:41:53 +0000
commit0253cf3cca45f65caaeabfe886a41da5de916bdc (patch)
treefaab17e1bf51b7ff1b147c6c648bbb6075b2a359 /ldap/include
parent458a42a89182a23408e0db6482c59736936410d4 (diff)
downloadds-0253cf3cca45f65caaeabfe886a41da5de916bdc.tar.gz
ds-0253cf3cca45f65caaeabfe886a41da5de916bdc.tar.xz
ds-0253cf3cca45f65caaeabfe886a41da5de916bdc.zip
Resolves: bug 454030
Bug Description: Need to address 64-bit compiler warnings - again Reviewed by: nhosoi (Thanks!) Fix Description: This patch cleans up most of the other remaining compiler warnings. I compiled the directory server code with these flags on RHEL5 x86_64: -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic I also enabled argument/format match checking for most of the commonly used varadic functions. Most of the problems I found fell into these categories: 1) Too many or not enough arguments e.g. most everything that uses or did use LDAPDebug had extra 0,0 arguments. If they had been switched to use slapi_log_error, I removed the extra arguments - for those places still using LDAPDebug, I introduced more macros to handle the number of arguments, since C macros cannot be varadic. 2) When using NSPR formatting functions, we have to use %llu or %lld for 64-bit values, even on 64-bit systems. However, for regular system formatting functions, we have to use %ld or %lu. I introduced two new macros NSPRIu64 and NSPRI64 to handle cases where we are passing explicit 64-bit values to NSPR formatting functions, so that we can use the regular PRIu64 and PRI64 macros for regular system formatting functions. I also made sure we used NSPRI* only with NSPR functions, and used PRI* only with system functions. 3) use %lu for size_t and %ld for time_t I did find a few "real" errors, places that the code was doing something definitely not right: https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserver/ldap/servers/plugins/acl/aclinit.c_sec4 https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserver/ldap/servers/plugins/acl/acllas.c_sec17 https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserver/ldap/servers/plugins/http/http_impl.c_sec1 https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserver/ldap/servers/plugins/memberof/memberof.c_sec1 https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserver/ldap/servers/plugins/pam_passthru/pam_ptimpl.c_sec1 https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserver/ldap/servers/plugins/replication/cl5_api.c_sec5 https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserver/ldap/servers/plugins/replication/cl5_clcache.c_sec2 https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserver/ldap/servers/plugins/replication/replutil.c_sec1 https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserver/ldap/servers/slapd/libglobs.c_sec1 https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserver/ldap/servers/slapd/back-ldbm/dbverify.c_sec2 https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserver/ldap/servers/slapd/back-ldbm/ldif2ldbm.c_sec3 This is why it's important to use this compiler checking, and why it's important to fix compiler warnings, if for no other reason than the sheer noise from so many warnings can mask real errors. Platforms tested: RHEL5 Flag Day: no Doc impact: no
Diffstat (limited to 'ldap/include')
-rw-r--r--ldap/include/ldaplog.h60
1 files changed, 60 insertions, 0 deletions
diff --git a/ldap/include/ldaplog.h b/ldap/include/ldaplog.h
index 195f67c0..ef3559e4 100644
--- a/ldap/include/ldaplog.h
+++ b/ldap/include/ldaplog.h
@@ -73,9 +73,15 @@ extern "C" {
/* Disable by default */
#define LDAPDebug( level, fmt, arg1, arg2, arg3 )
#define LDAPDebugLevelIsSet( level ) (0)
+#define LDAPDebug0Args( level, fmt )
+#define LDAPDebug1Arg( level, fmt, arg )
+#define LDAPDebug2Args( level, fmt, arg1, arg2 )
#ifdef LDAP_DEBUG
# undef LDAPDebug
+# undef LDAPDebug0Args
+# undef LDAPDebug1Arg
+# undef LDAPDebug2Args
# undef LDAPDebugLevelIsSet
/* SLAPD_LOGGING should not be on for WINSOCK (16-bit Windows) */
@@ -90,6 +96,24 @@ extern "C" {
slapd_log_error_proc( NULL, fmt, arg1, arg2, arg3 ); \
} \
}
+# define LDAPDebug0Args( level, fmt ) \
+ { \
+ if ( *module_ldap_debug & level ) { \
+ slapd_log_error_proc( NULL, fmt ); \
+ } \
+ }
+# define LDAPDebug1Arg( level, fmt, arg ) \
+ { \
+ if ( *module_ldap_debug & level ) { \
+ slapd_log_error_proc( NULL, fmt, arg ); \
+ } \
+ }
+# define LDAPDebug2Args( level, fmt, arg1, arg2 ) \
+ { \
+ if ( *module_ldap_debug & level ) { \
+ slapd_log_error_proc( NULL, fmt, arg1, arg2 ); \
+ } \
+ }
# define LDAPDebugLevelIsSet( level ) (0 != (*module_ldap_debug & level))
# else /* Not _WIN32 */
extern int slapd_ldap_debug;
@@ -99,6 +123,24 @@ extern "C" {
slapd_log_error_proc( NULL, fmt, arg1, arg2, arg3 ); \
} \
}
+# define LDAPDebug0Args( level, fmt ) \
+ { \
+ if ( slapd_ldap_debug & level ) { \
+ slapd_log_error_proc( NULL, fmt ); \
+ } \
+ }
+# define LDAPDebug1Arg( level, fmt, arg ) \
+ { \
+ if ( slapd_ldap_debug & level ) { \
+ slapd_log_error_proc( NULL, fmt, arg ); \
+ } \
+ }
+# define LDAPDebug2Args( level, fmt, arg1, arg2 ) \
+ { \
+ if ( slapd_ldap_debug & level ) { \
+ slapd_log_error_proc( NULL, fmt, arg1, arg2 ); \
+ } \
+ }
# define LDAPDebugLevelIsSet( level ) (0 != (slapd_ldap_debug & level))
# endif /* Win32 */
# else /* no SLAPD_LOGGING */
@@ -110,6 +152,24 @@ extern "C" {
PR_snprintf( msg, sizeof(msg), fmt, arg1, arg2, arg3 ); \
ber_err_print( msg ); \
}
+# define LDAPDebug0Args( level, fmt ) \
+ if ( slapd_ldap_debug & level ) { \
+ char msg[256]; \
+ PR_snprintf( msg, sizeof(msg), fmt ); \
+ ber_err_print( msg ); \
+ }
+# define LDAPDebug1Arg( level, fmt, arg ) \
+ if ( slapd_ldap_debug & level ) { \
+ char msg[256]; \
+ PR_snprintf( msg, sizeof(msg), fmt, arg ); \
+ ber_err_print( msg ); \
+ }
+# define LDAPDebug2Args( level, fmt, arg1, arg2 ) \
+ if ( slapd_ldap_debug & level ) { \
+ char msg[256]; \
+ PR_snprintf( msg, sizeof(msg), fmt, arg1, arg2 ); \
+ ber_err_print( msg ); \
+ }
# define LDAPDebugLevelIsSet( level ) (0 != (slapd_ldap_debug & level))
# endif /* SLAPD_LOGGING */
#endif /* LDAP_DEBUG */