From: Hallvard Furuseth <hallvard@openldap.org>
Date: Mon, 23 Nov 1998 01:46:32 +0000 (+0000)
Subject: gcc -W cleanup
X-Git-Tag: OPENLDAP_SLAPD_BACK_LDAP~1040
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7273fd47fd2f25799dce4b7dcfcf8a419478499c;p=openldap

gcc -W cleanup
---

diff --git a/libraries/liblber/dtest.c b/libraries/liblber/dtest.c
index d2f72154b4..a03bb626af 100644
--- a/libraries/liblber/dtest.c
+++ b/libraries/liblber/dtest.c
@@ -59,7 +59,7 @@ main( int argc, char **argv )
 		fprintf( stderr, "ber_scanf returns -1\n" );
 		exit( 1 );
 	}
-	printf( "got int %d\n", i );
+	printf( "got int %ld\n", i );
 
 	return( 0 );
 }
diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index 9cc47942c9..a552c3f543 100644
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -149,7 +149,7 @@ wait4msg( LDAP *ld, int msgid, int all, struct timeval *timeout,
 		    0, 0, 0 );
 	} else {
 		Debug( LDAP_DEBUG_TRACE, "wait4msg (timeout %ld sec, %ld usec)\n",
-		    timeout->tv_sec, timeout->tv_usec, 0 );
+		       (long) timeout->tv_sec, (long) timeout->tv_usec, 0 );
 	}
 #endif /* LDAP_DEBUG */
 
@@ -249,7 +249,7 @@ wait4msg( LDAP *ld, int msgid, int all, struct timeval *timeout,
 			}
 
 			Debug( LDAP_DEBUG_TRACE, "wait4msg:  %ld secs to go\n",
-				tv.tv_sec, 0, 0 );
+			       (long) tv.tv_sec, 0, 0 );
 			start_time = tmp_time;
 		}
 	}
diff --git a/libraries/liblutil/passwd.c b/libraries/liblutil/passwd.c
index 89b45b92c3..869b56a345 100644
--- a/libraries/liblutil/passwd.c
+++ b/libraries/liblutil/passwd.c
@@ -44,7 +44,7 @@ lutil_passwd(
 
 		ldap_MD5Init(&MD5context);
 		ldap_MD5Update(&MD5context,
-			cred, strlen(cred));
+			       (const unsigned char *)cred, strlen(cred));
 		ldap_MD5Final(MD5digest, &MD5context);
 
 		if ( b64_ntop(MD5digest, sizeof(MD5digest),
@@ -63,7 +63,7 @@ lutil_passwd(
 
 		ldap_SHA1Init(&SHA1context);
 		ldap_SHA1Update(&SHA1context,
-			(unsigned char *) cred, strlen(cred));
+				(const unsigned char *) cred, strlen(cred));
 		ldap_SHA1Final(SHA1digest, &SHA1context);
 
 		if (b64_ntop(SHA1digest, sizeof(SHA1digest),