This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch master
in repository 389-ds-base.
commit b23201b34cb68de8b0a8720b51b29fee7d6fa429
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Fri Jul 7 14:59:08 2017 -0400
Ticket 49295 - Fix CI tests and compiler warnings
Description: Fix CI and compiler warnings
https://pagure.io/389-ds-base/issue/49295
Reviewed by: mreynolds(one line commit rule)
---
dirsrvtests/tests/tickets/ticket48759_test.py | 3 ++-
ldap/servers/slapd/daemon.c | 4 ++--
ldap/servers/slapd/monitor.c | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dirsrvtests/tests/tickets/ticket48759_test.py
b/dirsrvtests/tests/tickets/ticket48759_test.py
index 3406a78..35bbec9 100644
--- a/dirsrvtests/tests/tickets/ticket48759_test.py
+++ b/dirsrvtests/tests/tickets/ticket48759_test.py
@@ -13,7 +13,8 @@ from lib389.tasks import *
from lib389.topologies import topology_st
from lib389._constants import (PLUGIN_MEMBER_OF, DEFAULT_SUFFIX, REPLICAROLE_MASTER,
REPLICAID_MASTER_1,
- DN_CONFIG, PLUGIN_RETRO_CHANGELOG, REPLICA_PRECISE_PURGING,
REPLICA_PURGE_DELAY)
+ DN_CONFIG, PLUGIN_RETRO_CHANGELOG, REPLICA_PRECISE_PURGING,
REPLICA_PURGE_DELAY,
+ REPLICA_PURGE_INTERVAL)
log = logging.getLogger(__name__)
diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c
index 1592f9d..37eb5e7 100644
--- a/ldap/servers/slapd/daemon.c
+++ b/ldap/servers/slapd/daemon.c
@@ -1213,7 +1213,7 @@ void slapd_daemon( daemon_ports_t *ports, ns_thrpool_t *tp )
threads = g_get_active_threadcnt();
if ( threads > 0 ) {
slapi_log_err(SLAPI_LOG_INFO, "slapd_daemon",
- "slapd shutting down - waiting for %d thread%s to terminate\n",
+ "slapd shutting down - waiting for %lu thread%s to terminate\n",
threads, ( threads > 1 ) ? "s" : "");
}
@@ -1252,7 +1252,7 @@ void slapd_daemon( daemon_ports_t *ports, ns_thrpool_t *tp )
DS_Sleep(PR_INTERVAL_NO_WAIT);
if ( threads != g_get_active_threadcnt() ) {
slapi_log_err(SLAPI_LOG_TRACE, "slapd_daemon",
- "slapd shutting down - waiting for %d threads to terminate\n",
+ "slapd shutting down - waiting for %lu threads to terminate\n",
g_get_active_threadcnt());
threads = g_get_active_threadcnt();
}
diff --git a/ldap/servers/slapd/monitor.c b/ldap/servers/slapd/monitor.c
index 8dd27af..2271bfa 100644
--- a/ldap/servers/slapd/monitor.c
+++ b/ldap/servers/slapd/monitor.c
@@ -59,7 +59,7 @@ monitor_info(Slapi_PBlock *pb __attribute__((unused)),
attrlist_replace( &e->e_attrs, "version", vals );
slapi_ch_free( (void **) &val.bv_val );
- val.bv_len = snprintf( buf, sizeof(buf), "%d", g_get_active_threadcnt() );
+ val.bv_len = snprintf( buf, sizeof(buf), "%lu", g_get_active_threadcnt() );
val.bv_val = buf;
attrlist_replace( &e->e_attrs, "threads", vals );
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.