From: Hallvard Furuseth <hallvard@openldap.org>
Date: Sat, 7 Aug 1999 05:36:48 +0000 (+0000)
Subject: Minor cleanup:
X-Git-Tag: TWEB_OL_BASE~263
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6054463eebada1bb760f01b538e072d9011ec0e2;p=openldap

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 981784eaf9..441ac20684 100644
--- 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 8ec9132954..262dd3c4b8 100644
--- 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 4e9d46cf81..e0625f20bc 100644
--- 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 31b1283b61..f958862535 100644
--- 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 445ba1bcc3..43ec5b288e 100644
--- 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 c1f8b24ae5..1316668523 100644
--- 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 b650ee4a92..6bb7ed351e 100644
--- 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 de0adb6ef7..37b36d1ea6 100644
--- 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 a24a9f68ee..e2ecd1ad10 100644
--- 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 4c509860c7..2e3437429b 100644
--- 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 */