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 86931be09c3dceff8ea2977e36ef6256b66039e6
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue Apr 18 10:34:11 2017 -0400
Issue 49204 - Fix 32bit arch build failures
Description: Fix more conflicting types for x686
https://pagure.io/389-ds-base/issue/49204
Reviewed by: firstyear(Thanks!)
---
ldap/servers/slapd/back-ldbm/cache.c | 4 ++--
ldap/servers/slapd/back-ldbm/dblayer.c | 18 +++++++++---------
ldap/servers/slapd/back-ldbm/dblayer.h | 12 ++++++------
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/ldap/servers/slapd/back-ldbm/cache.c b/ldap/servers/slapd/back-ldbm/cache.c
index a9cc7d1..3e40eec 100644
--- a/ldap/servers/slapd/back-ldbm/cache.c
+++ b/ldap/servers/slapd/back-ldbm/cache.c
@@ -65,7 +65,7 @@
/* static functions */
static void entrycache_clear_int(struct cache *cache);
-static void entrycache_set_max_size(struct cache *cache, size_t bytes);
+static void entrycache_set_max_size(struct cache *cache, uint64_t bytes);
static int entrycache_remove_int(struct cache *cache, struct backentry *e);
static void entrycache_return(struct cache *cache, struct backentry **bep);
static int entrycache_replace(struct cache *cache, struct backentry *olde, struct
backentry *newe);
@@ -77,7 +77,7 @@ static void entry_lru_verify(struct cache *cache, struct backentry *e,
int in);
static int dn_same_id(const void *bdn, const void *k);
static void dncache_clear_int(struct cache *cache);
-static void dncache_set_max_size(struct cache *cache, size_t bytes);
+static void dncache_set_max_size(struct cache *cache, uint64_t bytes);
static int dncache_remove_int(struct cache *cache, struct backdn *dn);
static void dncache_return(struct cache *cache, struct backdn **bdn);
static int dncache_replace(struct cache *cache, struct backdn *olddn, struct backdn
*newdn);
diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c
b/ldap/servers/slapd/back-ldbm/dblayer.c
index 22e5ffb..ff97aa4 100644
--- a/ldap/servers/slapd/back-ldbm/dblayer.c
+++ b/ldap/servers/slapd/back-ldbm/dblayer.c
@@ -1237,8 +1237,8 @@ no_diskspace(struct ldbminfo *li, int dbenv_flags)
struct statvfs db_buf;
int using_region_files = !(dbenv_flags & ( DB_PRIVATE | DB_SYSTEM_MEM));
/* value of 10 == 10% == little more than the average overhead calculated for very
large files on 64-bit system for bdb 4.7 */
- PRUint64 expected_siz = li->li_dbcachesize + li->li_dbcachesize/10; /* dbcache
+ region files */
- PRUint64 fsiz;
+ uint64_t expected_siz = li->li_dbcachesize + li->li_dbcachesize/10; /* dbcache
+ region files */
+ uint64_t fsiz;
char *region_dir;
if (statvfs(li->li_directory, &db_buf) < 0){
@@ -1263,7 +1263,7 @@ no_diskspace(struct ldbminfo *li, int dbenv_flags)
li->li_dblayer_private->dblayer_dbhome_directory);
return 1;
}
- fsiz = ((PRUint64)dbhome_buf.f_bavail) * ((PRUint64)dbhome_buf.f_bsize);
+ fsiz = ((uint64_t)dbhome_buf.f_bavail) * ((uint64_t)dbhome_buf.f_bsize);
region_dir = li->li_dblayer_private->dblayer_dbhome_directory;
} else {
/* Shared/private memory. No need to check disk space, return success
*/
@@ -3821,7 +3821,7 @@ static const u_int32_t default_flags = DB_NEXT;
typedef struct txn_test_iter {
DB *db;
DBC *cur;
- size_t cnt;
+ uint64_t cnt;
const char *attr;
u_int32_t flags;
backend *be;
@@ -3943,10 +3943,10 @@ static int txn_test_threadmain(void *param)
Object *inst_obj;
int rc = 0;
txn_test_iter **ttilist = NULL;
- size_t tticnt = 0;
+ uint64_t tticnt = 0;
DB_TXN *txn = NULL;
txn_test_cfg cfg = {0};
- size_t counter = 0;
+ uint64_t counter = 0;
char keybuf[8192];
char databuf[8192];
int dbattempts = 0;
@@ -4067,9 +4067,9 @@ retry_txn:
if (!rc) {
DBT key;
DBT data;
- size_t ii;
- size_t donecnt = 0;
- size_t cnt = 0;
+ uint64_t ii;
+ uint64_t donecnt = 0;
+ uint64_t cnt = 0;
/* phase 1 - open a cursor to each db */
if (cfg.verbose) {
diff --git a/ldap/servers/slapd/back-ldbm/dblayer.h
b/ldap/servers/slapd/back-ldbm/dblayer.h
index 816c943..77b04fa 100644
--- a/ldap/servers/slapd/back-ldbm/dblayer.h
+++ b/ldap/servers/slapd/back-ldbm/dblayer.h
@@ -90,8 +90,8 @@ struct dblayer_private
int dblayer_ncache;
int dblayer_previous_ncache;
int dblayer_tx_max;
- size_t dblayer_cachesize;
- size_t dblayer_previous_cachesize; /* Cache size when we last shut down--
+ uint64_t dblayer_cachesize;
+ uint64_t dblayer_previous_cachesize; /* Cache size when we last shut down--
* used to determine if we delete
* the mpool */
int dblayer_recovery_required;
@@ -102,15 +102,15 @@ struct dblayer_private
int dblayer_durable_transactions;
int dblayer_checkpoint_interval;
int dblayer_circular_logging;
- size_t dblayer_page_size; /* db page size if configured,
+ uint64_t dblayer_page_size; /* db page size if configured,
* otherwise default to DBLAYER_PAGESIZE */
- size_t dblayer_index_page_size; /* db index page size if configured,
+ uint64_t dblayer_index_page_size; /* db index page size if configured,
* otherwise default to
* DBLAYER_INDEX_PAGESIZE */
int dblayer_idl_divisor; /* divide page size by this to get IDL
* size */
- size_t dblayer_logfile_size; /* How large can one logfile be ? */
- size_t dblayer_logbuf_size; /* how large log buffer can be */
+ uint64_t dblayer_logfile_size; /* How large can one logfile be ? */
+ uint64_t dblayer_logbuf_size; /* how large log buffer can be */
int dblayer_file_mode; /* pmode for files we create */
int dblayer_verbose; /* Get libdb to exhale debugging info */
int dblayer_debug; /* Will libdb emit debugging info into
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.