From 17fe0f59f8a33fdddfac49dada8c42c2ed3819f6 Mon Sep 17 00:00:00 2001
From: Hallvard Furuseth <hallvard@openldap.org>
Date: Mon, 23 Nov 1998 04:33:53 +0000
Subject: [PATCH] gcc -Wformat cleanup
---
servers/slapd/acl.c | 8 ++++----
servers/slapd/connection.c | 4 ++--
servers/slapd/repl.c | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 5bb093fea9..72a89e2751 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -72,8 +72,8 @@ access_allowed(
if (a) {
for (i = 0; i < MAXREMATCHES && matches[i].rm_so > 0; i++) {
- Debug( LDAP_DEBUG_ARGS, "=> match[%d]: %d %d ",
- i, matches[i].rm_so, matches[i].rm_eo );
+ Debug( LDAP_DEBUG_ARGS, "=> match[%d]: %d %d ", i,
+ (int)matches[i].rm_so, (int)matches[i].rm_eo );
if( matches[i].rm_so <= matches[0].rm_eo ) {
for ( n = matches[i].rm_so; n < matches[i].rm_eo; n++) {
@@ -129,7 +129,7 @@ acl_get_applicable(
for ( i = 1, a = be->be_acl; a != NULL; a = a->acl_next, i++ ) {
if (a->acl_dnpat != NULL) {
Debug( LDAP_DEBUG_TRACE, "=> dnpat: [%d] %s nsub: %d\n",
- i, a->acl_dnpat, a->acl_dnre.re_nsub);
+ i, a->acl_dnpat, (int) a->acl_dnre.re_nsub);
if (regexec(&a->acl_dnre, edn, nmatch, matches, 0))
continue;
@@ -160,7 +160,7 @@ acl_get_applicable(
for ( i = 1, a = global_acl; a != NULL; a = a->acl_next, i++ ) {
if (a->acl_dnpat != NULL) {
Debug( LDAP_DEBUG_TRACE, "=> dnpat: [%d] %s nsub: %d\n",
- i, a->acl_dnpat, a->acl_dnre.re_nsub);
+ i, a->acl_dnpat, (int) a->acl_dnre.re_nsub);
if (regexec(&a->acl_dnre, edn, nmatch, matches, 0)) {
continue;
diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 36fca0b705..2d630f4168 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -129,8 +129,8 @@ connection_activity(
"ber_get_next on fd %d failed errno %d (%s)\n",
conn->c_sb.sb_sd, errno, errno > -1 && errno < sys_nerr ?
sys_errlist[errno] : "unknown" );
- Debug( LDAP_DEBUG_TRACE, "*** got %d of %lu so far\n",
- conn->c_currentber->ber_rwptr - conn->c_currentber->ber_buf,
+ Debug( LDAP_DEBUG_TRACE, "*** got %ld of %lu so far\n",
+ (long)(conn->c_currentber->ber_rwptr - conn->c_currentber->ber_buf),
conn->c_currentber->ber_len, 0 );
if ( errno != EWOULDBLOCK && errno != EAGAIN ) {
diff --git a/servers/slapd/repl.c b/servers/slapd/repl.c
index 4f46ec114d..ecea75af7a 100644
--- a/servers/slapd/repl.c
+++ b/servers/slapd/repl.c
@@ -44,7 +44,7 @@ replog(
i++ ) {
fprintf( fp, "replica: %s\n", be->be_replica[i] );
}
- fprintf( fp, "time: %ld\n", currenttime );
+ fprintf( fp, "time: %ld\n", (long) currenttime );
fprintf( fp, "dn: %s\n", dn );
switch ( optype ) {
--
GitLab