Minor cleanup:

Fix Statlog() formats, remove an implicit int, include <ctype.h> for isspace().

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 981784eaf90f6e857f0060db4a3dab8d00149d62..441ac206847793868677295be81c8e7200f540b6 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -131,7 +131,7 @@ do_add( Connection *conn, Operation *op )
                return rc;
        } 
 
-       Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d ADD dn=\"%s\"\n",
+       Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d ADD dn=\"%s\"\n",
            op->o_connid, op->o_opid, e->e_ndn, 0, 0 );
 
        /*

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 8ec91329540ce6545d7f059eb41643dfa52c3953..262dd3c4b8cb773d354a02a131d9b8da5d090d66 100644 (file)
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -159,8 +159,8 @@ do_bind(
                        version, dn, method );
        }
 
-       Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d BIND dn=\"%s\" method=%d\n",
-           op->o_connid, op->o_opid, ndn, method, 0 );
+       Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d BIND dn=\"%s\" method=%ld\n",
+           op->o_connid, op->o_opid, ndn, (unsigned long) method, 0 );
 
        if ( version < LDAP_VERSION_MIN || version > LDAP_VERSION_MAX ) {
                Debug( LDAP_DEBUG_ANY, "unknown version %d\n", version, 0, 0 );

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index 4e9d46cf81be5342ab963e6c9fd0f1d9a976d718..e0625f20bc91e4a0a3b2e429b5be70aa21291993 100644 (file)
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -84,7 +84,7 @@ do_compare(
        Debug( LDAP_DEBUG_ARGS, "do_compare: dn (%s) attr (%s) value (%s)\n",
            ndn, ava.ava_type, ava.ava_value.bv_val );
 
-       Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d CMP dn=\"%s\" attr=\"%s\"\n",
+       Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d CMP dn=\"%s\" attr=\"%s\"\n",
            op->o_connid, op->o_opid, ndn, ava.ava_type, 0 );
 
        /*

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 31b1283b61cef0d12e98fdd40d811ca14cb72e8e..f958862535fdc45007be9755686b6be0c77e7bea 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -505,7 +505,7 @@ connection_destroy( Connection *c )
                ber_pvt_sb_close( c->c_sb );
 
                Statslog( LDAP_DEBUG_STATS,
-                   "conn=%d fd=%d closed.\n",
+                   "conn=%ld fd=%d closed.\n",
                        c->c_connid, sd, 0, 0, 0 );
        }
 

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 445ba1bcc317d76859d5f0c63c043501d88023df..43ec5b288e319bdedc0d60bdb0947b8f78d3ba12 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -451,6 +451,7 @@ int slapd_daemon_init(char *urls, int port, int tls_port )
 }
 
 
+int
 slapd_daemon_destroy(void)
 {
        connections_destroy();
@@ -755,7 +756,7 @@ slapd_daemon_task(
                        }
 
                        Statslog( LDAP_DEBUG_STATS,
-                               "daemon: conn=%d fd=%ld connection from %s (%s) accepted.\n",
+                               "daemon: conn=%ld fd=%ld connection from %s (%s) accepted.\n",
                                id, (long) s,
                                peername,
                                slap_listeners[l]->sl_name,

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index c1f8b24ae590c6059234017e7f522a5a9f6ae485..1316668523a109401505a491236c4e6c93e8356d 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -162,7 +162,7 @@ do_modify(
                return rc;
        } 
 
-       Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d MOD dn=\"%s\"\n",
+       Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d MOD dn=\"%s\"\n",
            op->o_connid, op->o_opid, ndn, 0, 0 );
 
        /*

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index b650ee4a9238d8e14e668763259cf17934d6f39f..6bb7ed351e53d74cb175003fc95cbb7fabf9ab74 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -172,7 +172,7 @@ do_modrdn(
                return rc;
        } 
 
-       Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d MODRDN dn=\"%s\"\n",
+       Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d MODRDN dn=\"%s\"\n",
            op->o_connid, op->o_opid, ndn, 0, 0 );
 
        /*

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index de0adb6ef79913d6598a4e0f4ccb30c747b352eb..37b36d1ea6ba1519ecdf4399aed6a5783c195a4c 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -8,6 +8,7 @@
 #include <ac/errno.h>
 #include <ac/signal.h>
 #include <ac/string.h>
+#include <ac/ctype.h>
 #include <ac/time.h>
 #include <ac/unistd.h>
 

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index a24a9f68ee60fb9c76061a72b762bb0575171710..e2ecd1ad10f75d887ec524e65bdcf9592d218d72 100644 (file)
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -157,7 +157,7 @@ do_search(
        Debug( LDAP_DEBUG_ARGS, "\n", 0, 0, 0 );
 
        Statslog( LDAP_DEBUG_STATS,
-           "conn=%d op=%d SRCH base=\"%s\" scope=%d filter=\"%s\"\n",
+           "conn=%ld op=%d SRCH base=\"%s\" scope=%d filter=\"%s\"\n",
            op->o_connid, op->o_opid, base, scope, fstr );
 
        if ( scope == LDAP_SCOPE_BASE ) {

diff --git a/servers/slapd/unbind.c b/servers/slapd/unbind.c
index 4c509860c75de3549c40b848cd13d4f5f7a2a8e9..2e3437429bcc6419443cc4938eefcd92087f2436 100644 (file)
--- a/servers/slapd/unbind.c
+++ b/servers/slapd/unbind.c
@@ -40,7 +40,7 @@ do_unbind(
         *      UnBindRequest ::= NULL
         */
 
-       Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d UNBIND\n", op->o_connid,
+       Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d UNBIND\n", op->o_connid,
            op->o_opid, 0, 0, 0 );
 
        /* pass the unbind to all backends */