This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch 389-ds-base-1.3.8
in repository 389-ds-base.
commit 030df1373f7c7b8c77864bc0a9fa7f4b49a87260
Author: Mark Reynolds <mreynolds@redhat.com>
Date: Mon Jun 11 10:26:42 2018 -0400
Ticket 49746 - Additional compiler errors on ARM
Description: These are the final compiler warnings to fix
https://pagure.io/389-ds-base/issue/49746
---
ldap/servers/plugins/posix-winsync/posix-winsync.c | 10 ++++----
ldap/servers/plugins/replication/repl5_agmt.c | 30 +++++++++++-----------
ldap/servers/plugins/replication/repl5_replica.c | 20 +++++++--------
ldap/servers/plugins/replication/replutil.c | 2 +-
ldap/servers/slapd/back-ldbm/back-ldbm.h | 2 +-
ldap/servers/slapd/back-ldbm/cache.c | 10 ++++----
ldap/servers/slapd/back-ldbm/dblayer.c | 2 +-
ldap/servers/slapd/back-ldbm/idl_new.c | 8 +++---
ldap/servers/slapd/back-ldbm/ldbm_add.c | 2 +-
ldap/servers/slapd/back-ldbm/ldbm_delete.c | 2 +-
ldap/servers/slapd/back-ldbm/monitor.c | 6 ++---
ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 6 ++---
ldap/servers/slapd/back-ldbm/start.c | 4 +--
13 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/ldap/servers/plugins/posix-winsync/posix-winsync.c b/ldap/servers/plugins/posix-winsync/posix-winsync.c
index 07e4804..a7ae914 100644
--- a/ldap/servers/plugins/posix-winsync/posix-winsync.c
+++ b/ldap/servers/plugins/posix-winsync/posix-winsync.c
@@ -233,7 +233,7 @@ sync_acct_disable(void *cbdata __attribute__((unused)), /* the usual domain conf
{
int ds_is_enabled = 1; /* default to true */
int ad_is_enabled = 1; /* default to true */
- uint64_t adval = 0; /* raw account val from ad entry */
+ uint32_t adval = 0; /* raw account val from ad entry */
int isvirt = 0;
/* get the account lock state of the ds entry */
@@ -257,7 +257,7 @@ sync_acct_disable(void *cbdata __attribute__((unused)), /* the usual domain conf
/* have to enable or disable */
if (direction == ACCT_DISABLE_TO_AD) {
- unsigned long mask;
+ uint32_t mask;
/* set the mod or entry */
if (ds_is_enabled) {
mask = ~0x2;
@@ -269,7 +269,7 @@ sync_acct_disable(void *cbdata __attribute__((unused)), /* the usual domain conf
if (update_entry) {
slapi_entry_attr_set_ulong(update_entry, "userAccountControl", adval);
slapi_log_err(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
- "<-- sync_acct_disable - %s AD account [%s] - new value is [%" PRIu64 "]\n",
+ "<-- sync_acct_disable - %s AD account [%s] - new value is [%" PRIu32 "]\n",
(ds_is_enabled) ? "enabled" : "disabled", slapi_entry_get_dn_const(update_entry), adval);
} else {
/* iterate through the mods - if there is already a mod
@@ -318,13 +318,13 @@ sync_acct_disable(void *cbdata __attribute__((unused)), /* the usual domain conf
mask = 0x2;
adval |= mask; /* set the 0x2 disable bit */
}
- PR_snprintf(acctvalstr, sizeof(acctvalstr), "%lu", adval);
+ PR_snprintf(acctvalstr, sizeof(acctvalstr), "%" PRIu32, adval);
slapi_ch_free_string(&mod_bval->bv_val);
mod_bval->bv_val = slapi_ch_strdup(acctvalstr);
mod_bval->bv_len = strlen(acctvalstr);
}
slapi_log_err(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
- "<-- sync_acct_disable - %s AD account [%s] - new value is [%" PRIu64 "]\n",
+ "<-- sync_acct_disable - %s AD account [%s] - new value is [%" PRIu32 "]\n",
(ds_is_enabled) ? "enabled" : "disabled", slapi_entry_get_dn_const(ad_entry), adval);
}
}
diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c
index d71d3f3..1ddd6ea 100644
--- a/ldap/servers/plugins/replication/repl5_agmt.c
+++ b/ldap/servers/plugins/replication/repl5_agmt.c
@@ -182,25 +182,25 @@ agmt_is_valid(Repl_Agmt *ra)
}
if (ra->port <= 0) {
slapi_log_err(SLAPI_LOG_ERR, repl_plugin_name, "agmt_is_valid - Replication agreement \"%s\" "
- "is malformed: invalid port number %ld.\n",
+ "is malformed: invalid port number %" PRId64 ".\n",
slapi_sdn_get_dn(ra->dn), ra->port);
return_value = 0;
}
if (ra->timeout < 0) {
slapi_log_err(SLAPI_LOG_ERR, repl_plugin_name, "agmt_is_valid - Replication agreement \"%s\" "
- "is malformed: invalid timeout %ld.\n",
+ "is malformed: invalid timeout %" PRId64 ".\n",
slapi_sdn_get_dn(ra->dn), ra->timeout);
return_value = 0;
}
if (ra->busywaittime < 0) {
slapi_log_err(SLAPI_LOG_ERR, repl_plugin_name, "agmt_is_valid - Replication agreement \"%s\" "
- "is malformed: invalid busy wait time %ld.\n",
+ "is malformed: invalid busy wait time %" PRId64 ".\n",
slapi_sdn_get_dn(ra->dn), ra->busywaittime);
return_value = 0;
}
if (ra->pausetime < 0) {
slapi_log_err(SLAPI_LOG_ERR, repl_plugin_name, "agmt_is_valid - Replication agreement \"%s\" "
- "is malformed: invalid pausetime %ld.\n",
+ "is malformed: invalid pausetime %" PRId64 ".\n",
slapi_sdn_get_dn(ra->dn), ra->pausetime);
return_value = 0;
}
@@ -225,10 +225,10 @@ agmt_is_valid(Repl_Agmt *ra)
} else {
auth_mech = "Unknown";
}
- slapi_log_err(SLAPI_LOG_ERR, repl_plugin_name, "agmt_is_valid - Replication agreement \"%s\" "
- "is malformed: a bind DN and password must be supplied for authentication "
- "method \"%s\"\n",
- slapi_sdn_get_dn(ra->dn), auth_mech);
+ slapi_log_err(SLAPI_LOG_ERR, repl_plugin_name,
+ "agmt_is_valid - Replication agreement \"%s\" is malformed: "
+ "a bind DN and password must be supplied for authentication method \"%s\"\n",
+ slapi_sdn_get_dn(ra->dn), auth_mech);
return_value = 0;
}
}
@@ -468,7 +468,7 @@ agmt_new_from_entry(Slapi_Entry *e)
if (dot) {
*dot = '\0';
}
- ra->long_name = slapi_ch_smprintf("agmt=\"%s\" (%s:%ld)", agmtname, hostname, ra->port);
+ ra->long_name = slapi_ch_smprintf("agmt=\"%s\" (%s:%" PRId64 ")", agmtname, hostname, ra->port);
}
/* DBDB: review this code */
@@ -791,10 +791,10 @@ agmt_start(Repl_Agmt *ra)
char buf[BUFSIZ];
char unavail_buf[BUFSIZ];
- PR_snprintf(buf, BUFSIZ, "%s;%s;%s;%ld;", slapi_sdn_get_dn(repl_sdn),
+ PR_snprintf(buf, BUFSIZ, "%s;%s;%s;%" PRId64 ";", slapi_sdn_get_dn(repl_sdn),
slapi_rdn_get_value_by_ref(slapi_rdn_get_rdn(ra->rdn)),
ra->hostname, ra->port);
- PR_snprintf(unavail_buf, BUFSIZ, "%s;%s;%s;%ld;unavailable", slapi_sdn_get_dn(repl_sdn),
+ PR_snprintf(unavail_buf, BUFSIZ, "%s;%s;%s;%" PRId64 ";unavailable", slapi_sdn_get_dn(repl_sdn),
slapi_rdn_get_value_by_ref(slapi_rdn_get_rdn(ra->rdn)),
ra->hostname, ra->port);
if (strstr(maxcsns[i], buf) || strstr(maxcsns[i], unavail_buf)) {
@@ -3029,11 +3029,11 @@ agmt_update_maxcsn(Replica *r, Slapi_DN *sdn, int op, LDAPMod **mods, CSN *csn)
* temporarily mark it as "unavailable".
*/
slapi_ch_free_string(&agmt->maxcsn);
- agmt->maxcsn = slapi_ch_smprintf("%s;%s;%s;%ld;unavailable", slapi_sdn_get_dn(agmt->replarea),
+ agmt->maxcsn = slapi_ch_smprintf("%s;%s;%s;%" PRId64 ";unavailable", slapi_sdn_get_dn(agmt->replarea),
slapi_rdn_get_value_by_ref(slapi_rdn_get_rdn(agmt->rdn)), agmt->hostname, agmt->port);
} else if (rid == oprid) {
slapi_ch_free_string(&agmt->maxcsn);
- agmt->maxcsn = slapi_ch_smprintf("%s;%s;%s;%ld;%d;%s", slapi_sdn_get_dn(agmt->replarea),
+ agmt->maxcsn = slapi_ch_smprintf("%s;%s;%s;%" PRId64 ";%" PRIu16 ";%s", slapi_sdn_get_dn(agmt->replarea),
slapi_rdn_get_value_by_ref(slapi_rdn_get_rdn(agmt->rdn)), agmt->hostname,
agmt->port, agmt->consumerRID, maxcsn);
}
@@ -3227,10 +3227,10 @@ agmt_remove_maxcsn(Repl_Agmt *ra)
char unavail_buf[BUFSIZ];
struct berval val;
- PR_snprintf(buf, BUFSIZ, "%s;%s;%s;%ld;", slapi_sdn_get_dn(ra->replarea),
+ PR_snprintf(buf, BUFSIZ, "%s;%s;%s;%" PRId64 ";", slapi_sdn_get_dn(ra->replarea),
slapi_rdn_get_value_by_ref(slapi_rdn_get_rdn(ra->rdn)),
ra->hostname, ra->port);
- PR_snprintf(unavail_buf, BUFSIZ, "%s;%s;%s;%ld;unavailable",
+ PR_snprintf(unavail_buf, BUFSIZ, "%s;%s;%s;%" PRId64 ";unavailable",
slapi_sdn_get_dn(ra->replarea),
slapi_rdn_get_value_by_ref(slapi_rdn_get_rdn(ra->rdn)),
ra->hostname, ra->port);
diff --git a/ldap/servers/plugins/replication/repl5_replica.c b/ldap/servers/plugins/replication/repl5_replica.c
index 62bd84e..dee2087 100644
--- a/ldap/servers/plugins/replication/repl5_replica.c
+++ b/ldap/servers/plugins/replication/repl5_replica.c
@@ -72,8 +72,8 @@ struct replica
typedef struct reap_callback_data
{
int rc;
- unsigned long num_entries;
- unsigned long num_purged_entries;
+ uint64_t num_entries;
+ uint64_t num_purged_entries;
CSN *purge_csn;
PRBool *tombstone_reap_stop;
} reap_callback_data;
@@ -1897,7 +1897,7 @@ _replica_init_from_config(Replica *r, Slapi_Entry *e, char *errortext)
/* Verify backoff min and max work together */
if (backoff_min > backoff_max) {
PR_snprintf(errormsg, SLAPI_DSE_RETURNTEXT_SIZE,
- "Backoff minimum (%ld) can not be greater than the backoff maximum (%ld).",
+ "Backoff minimum (%" PRId64 ") can not be greater than the backoff maximum (%ld).",
backoff_min, backoff_max);
slapi_log_err(SLAPI_LOG_ERR, repl_plugin_name, "_replica_init_from_config - "
"%s\n", errormsg);
@@ -2994,8 +2994,8 @@ process_reap_entry(Slapi_Entry *entry, void *cb_data)
{
char deletion_csn_str[CSN_STRSIZE];
char purge_csn_str[CSN_STRSIZE];
- unsigned long *num_entriesp = &((reap_callback_data *)cb_data)->num_entries;
- unsigned long *num_purged_entriesp = &((reap_callback_data *)cb_data)->num_purged_entries;
+ uint64_t *num_entriesp = &((reap_callback_data *)cb_data)->num_entries;
+ uint64_t *num_purged_entriesp = &((reap_callback_data *)cb_data)->num_purged_entries;
CSN *purge_csn = ((reap_callback_data *)cb_data)->purge_csn;
/* this is a pointer into the actual value in the Replica object - so that
if the value is set in the replica, we will know about it immediately */
@@ -3179,14 +3179,14 @@ _replica_reap_tombstones(void *arg)
if (LDAP_SUCCESS != oprc) {
slapi_log_err(SLAPI_LOG_ERR, repl_plugin_name,
"_replica_reap_tombstones - Failed when searching for "
- "tombstones in replica %s: %s. Will try again in %ld "
+ "tombstones in replica %s: %s. Will try again in %" PRId64 " "
"seconds.\n",
slapi_sdn_get_dn(replica->repl_root),
ldap_err2string(oprc), replica->tombstone_reap_interval);
} else {
slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
- "_replica_reap_tombstones - Purged %ld of %ld tombstones "
- "in replica %s. Will try again in %ld "
+ "_replica_reap_tombstones - Purged %" PRId64 " of %" PRId64 " tombstones "
+ "in replica %s. Will try again in %" PRId64 " "
"seconds.\n",
cb_data.num_purged_entries, cb_data.num_entries,
slapi_sdn_get_dn(replica->repl_root),
@@ -3615,7 +3615,7 @@ replica_set_tombstone_reap_interval(Replica *r, long interval)
found = slapi_eq_cancel(r->repl_eqcxt_tr);
slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
- "replica_set_tombstone_reap_interval - tombstone_reap event (interval=%ld) was %s\n",
+ "replica_set_tombstone_reap_interval - tombstone_reap event (interval=%" PRId64 ") was %s\n",
r->tombstone_reap_interval, (found ? "cancelled" : "not found"));
r->repl_eqcxt_tr = NULL;
}
@@ -3625,7 +3625,7 @@ replica_set_tombstone_reap_interval(Replica *r, long interval)
slapi_current_utc_time() + r->tombstone_reap_interval,
1000 * r->tombstone_reap_interval);
slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
- "replica_set_tombstone_reap_interval - tombstone_reap event (interval=%ld) was %s\n",
+ "replica_set_tombstone_reap_interval - tombstone_reap event (interval=%" PRId64 ") was %s\n",
r->tombstone_reap_interval, (r->repl_eqcxt_tr ? "scheduled" : "not scheduled successfully"));
}
replica_unlock(r->repl_lock);
diff --git a/ldap/servers/plugins/replication/replutil.c b/ldap/servers/plugins/replication/replutil.c
index 7cc1323..a852f24 100644
--- a/ldap/servers/plugins/replication/replutil.c
+++ b/ldap/servers/plugins/replication/replutil.c
@@ -1076,7 +1076,7 @@ repl_config_valid_num(const char *config_attr, char *config_attr_value, int64_t
*returncode = LDAP_UNWILLING_TO_PERFORM;
if (errortext){
PR_snprintf(errortext, SLAPI_DSE_RETURNTEXT_SIZE,
- "Attribute %s value (%s) is invalid, must be a number between %ld and %ld.",
+ "Attribute %s value (%s) is invalid, must be a number between %" PRId64 " and %" PRId64 ".",
config_attr, config_attr_value, min, max);
slapi_log_err(SLAPI_LOG_ERR, repl_plugin_name, "repl_config_valid_num - %s\n",
errortext);
diff --git a/ldap/servers/slapd/back-ldbm/back-ldbm.h b/ldap/servers/slapd/back-ldbm/back-ldbm.h
index f13a42f..4727961 100644
--- a/ldap/servers/slapd/back-ldbm/back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/back-ldbm.h
@@ -551,7 +551,7 @@ struct ldbminfo
int li_allidsthreshold;
char *li_directory;
int li_reslimit_lookthrough_handle;
- size_t li_dbcachesize;
+ uint64_t li_dbcachesize;
uint64_t li_dblock;
int li_dbncache;
int li_import_cache_autosize; /* % of free memory to use
diff --git a/ldap/servers/slapd/back-ldbm/cache.c b/ldap/servers/slapd/back-ldbm/cache.c
index d84c630..86e1f7b 100644
--- a/ldap/servers/slapd/back-ldbm/cache.c
+++ b/ldap/servers/slapd/back-ldbm/cache.c
@@ -703,7 +703,7 @@ entrycache_set_max_size(struct cache *cache, uint64_t bytes)
}
void
-cache_set_max_entries(struct cache *cache, long entries)
+cache_set_max_entries(struct cache *cache, int64_t entries)
{
struct backentry *eflush = NULL;
struct backentry *eflushtemp = NULL;
@@ -731,10 +731,10 @@ cache_set_max_entries(struct cache *cache, long entries)
}
}
-size_t
+uint64_t
cache_get_max_size(struct cache *cache)
{
- size_t n = 0;
+ uint64_t n = 0;
cache_lock(cache);
n = cache->c_maxsize;
@@ -742,10 +742,10 @@ cache_get_max_size(struct cache *cache)
return n;
}
-long
+int64_t
cache_get_max_entries(struct cache *cache)
{
- long n;
+ int64_t n;
cache_lock(cache);
n = cache->c_maxentries;
diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c
index 0956998..e84cb76 100644
--- a/ldap/servers/slapd/back-ldbm/dblayer.c
+++ b/ldap/servers/slapd/back-ldbm/dblayer.c
@@ -3733,7 +3733,7 @@ print_ttilist(txn_test_iter **ttilist, uint32_t tticnt)
while (tticnt > 0) {
tticnt--;
slapi_log_err(SLAPI_LOG_ERR,
- "txn_test_threadmain", "attr [%s] cnt [%lu]\n",
+ "txn_test_threadmain", "attr [%s] cnt [%" PRIu64 "]\n",
ttilist[tticnt]->attr, ttilist[tticnt]->cnt);
}
}
diff --git a/ldap/servers/slapd/back-ldbm/idl_new.c b/ldap/servers/slapd/back-ldbm/idl_new.c
index 870ec29..4e28e3f 100644
--- a/ldap/servers/slapd/back-ldbm/idl_new.c
+++ b/ldap/servers/slapd/back-ldbm/idl_new.c
@@ -280,8 +280,8 @@ idl_new_fetch(
slapi_log_err(SLAPI_LOG_TRACE, "idl_new_fetch", "%s returns allids\n",
(char *)key.data);
} else {
- slapi_log_err(SLAPI_LOG_TRACE, "idl_new_fetch", "%s returns nids=%" PRIu64 "\n",
- (char *)key.data, (u_long)IDL_NIDS(idl));
+ slapi_log_err(SLAPI_LOG_TRACE, "idl_new_fetch", "%s returns nids=%" PRIu32 "\n",
+ (char *)key.data, (uint32_t)IDL_NIDS(idl));
}
error:
@@ -584,8 +584,8 @@ idl_new_range_fetch(
slapi_log_err(SLAPI_LOG_TRACE, "idl_new_range_fetch", "%s returns allids\n",
(char *)cur_key.data);
} else {
- slapi_log_err(SLAPI_LOG_TRACE, "idl_new_range_fetch", "%s returns nids=%" PRIu64 "\n",
- (char *)cur_key.data, (uint64_t)IDL_NIDS(idl));
+ slapi_log_err(SLAPI_LOG_TRACE, "idl_new_range_fetch", "%s returns nids=%" PRIu32 "\n",
+ (char *)cur_key.data, (uint32_t)IDL_NIDS(idl));
}
error:
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_add.c b/ldap/servers/slapd/back-ldbm/ldbm_add.c
index 63ac88b..32c8e71 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_add.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_add.c
@@ -1053,7 +1053,7 @@ ldbm_back_add(Slapi_PBlock *pb)
/* Push out the db modifications from the parent entry */
retval = modify_update_all(be, pb, &parent_modify_c, &txn);
slapi_log_err(SLAPI_LOG_BACKLDBM, "ldbm_back_add",
- "conn=%lu op=%d modify_update_all: old_entry=0x%p, new_entry=0x%p, rc=%d\n",
+ "conn=%" PRIu64 " op=%d modify_update_all: old_entry=0x%p, new_entry=0x%p, rc=%d\n",
conn_id, op_id, parent_modify_c.old_entry, parent_modify_c.new_entry, retval);
if (DB_LOCK_DEADLOCK == retval) {
slapi_log_err(SLAPI_LOG_ARGS, "ldbm_back_add", "add 6 DEADLOCK\n");
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
index 3781790..f5f6c1e 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
@@ -1148,7 +1148,7 @@ replace_entry:
/* Push out the db modifications from the parent entry */
retval = modify_update_all(be, pb, &parent_modify_c, &txn);
slapi_log_err(SLAPI_LOG_BACKLDBM, "ldbm_back_delete",
- "conn=%lu op=%d modify_update_all: old_entry=0x%p, new_entry=0x%p, rc=%d\n",
+ "conn=%" PRIu64 " op=%d modify_update_all: old_entry=0x%p, new_entry=0x%p, rc=%d\n",
conn_id, op_id, parent_modify_c.old_entry, parent_modify_c.new_entry, retval);
if (DB_LOCK_DEADLOCK == retval) {
slapi_log_err(SLAPI_LOG_BACKLDBM, "ldbm_back_delete", "4 DEADLOCK\n");
diff --git a/ldap/servers/slapd/back-ldbm/monitor.c b/ldap/servers/slapd/back-ldbm/monitor.c
index bcc6302..9b7c914 100644
--- a/ldap/servers/slapd/back-ldbm/monitor.c
+++ b/ldap/servers/slapd/back-ldbm/monitor.c
@@ -51,9 +51,9 @@ ldbm_back_monitor_instance_search(Slapi_PBlock *pb __attribute__((unused)),
uint64_t nentries;
int64_t maxentries;
uint64_t size, maxsize, count;
- size_t thread_size;
- size_t evicts;
- size_t slots;
+ uint64_t thread_size;
+ uint64_t evicts;
+ uint64_t slots;
/* NPCTE fix for bugid 544365, esc 0. <P.R> <04-Jul-2001> */
struct stat astat;
/* end of NPCTE fix for bugid 544365 */
diff --git a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
index eedaa09..0a5165a 100644
--- a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
@@ -36,9 +36,9 @@ int cache_init(struct cache *cache, uint64_t maxsize, long maxentries, int type)
void cache_clear(struct cache *cache, int type);
void cache_destroy_please(struct cache *cache, int type);
void cache_set_max_size(struct cache *cache, uint64_t bytes, int type);
-void cache_set_max_entries(struct cache *cache, long entries);
-size_t cache_get_max_size(struct cache *cache);
-long cache_get_max_entries(struct cache *cache);
+void cache_set_max_entries(struct cache *cache, int64_t entries);
+uint64_t cache_get_max_size(struct cache *cache);
+int64_t cache_get_max_entries(struct cache *cache);
void cache_get_stats(struct cache *cache, uint64_t *hits, uint64_t *tries, uint64_t *entries, int64_t *maxentries, uint64_t *size, uint64_t *maxsize);
void cache_debug_hash(struct cache *cache, char **out);
int cache_remove(struct cache *cache, void *e);
diff --git a/ldap/servers/slapd/back-ldbm/start.c b/ldap/servers/slapd/back-ldbm/start.c
index 4bccfc7..7d0cd22 100644
--- a/ldap/servers/slapd/back-ldbm/start.c
+++ b/ldap/servers/slapd/back-ldbm/start.c
@@ -223,12 +223,12 @@ ldbm_back_start_autotune(struct ldbminfo *li)
* it's highly unlikely.
*/
if (cache_size == 0 || cache_size == MINCACHESIZE || li->li_cache_autosize > 0) {
- slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_back_start", "cache autosizing: %s entry cache (%" PRIu64 " total): %luk\n", inst->inst_name, backend_count, entry_size / 1024);
+ slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_back_start", "cache autosizing: %s entry cache (%" PRIu64 " total): %" PRIu64 "k\n", inst->inst_name, backend_count, entry_size / 1024);
cache_set_max_entries(&(inst->inst_cache), -1);
cache_set_max_size(&(inst->inst_cache), li->li_cache_autosize_ec, CACHE_TYPE_ENTRY);
}
if (dncache_size == 0 || dncache_size == MINCACHESIZE || li->li_cache_autosize > 0) {
- slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_back_start", "cache autosizing: %s dn cache (%" PRIu64 " total): %luk\n", inst->inst_name, backend_count, dn_size / 1024);
+ slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_back_start", "cache autosizing: %s dn cache (%" PRIu64 " total): %" PRIu64 "k\n", inst->inst_name, backend_count, dn_size / 1024);
cache_set_max_entries(&(inst->inst_dncache), -1);
cache_set_max_size(&(inst->inst_dncache), li->li_dncache_autosize_ec, CACHE_TYPE_DN);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
389-commits mailing list -- 389-commits@lists.fedoraproject.org
To unsubscribe send an email to 389-commits-leave@lists.fedoraproject.org
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/389-commits@lists.fedoraproject.org/message/QT36HSHJDG5A7PJPZIFWHLHZRXXCBKMX/
No comments:
Post a Comment