size'edness issues in sdbm, which is limited to int's

(and in one case, manipulates an array of short's)

git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@587439 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 6 insertions, 6 deletions

diff --git a/dbm/apr_dbm_sdbm.c b/dbm/apr_dbm_sdbm.c
index 4c94841e..032c08cd 100644
--- a/dbm/apr_dbm_sdbm.c
+++ b/dbm/apr_dbm_sdbm.c
@@ -107,7 +107,7 @@ static apr_status_t vt_sdbm_fetch(apr_dbm_t *dbm, apr_datum_t key,
     apr_sdbm_datum_t kd, rd;
 
     kd.dptr = key.dptr;
-    kd.dsize = key.dsize;
+    kd.dsize = (int)key.dsize;
 
     rv = apr_sdbm_fetch(dbm->file, &rd, kd);
 
@@ -126,10 +126,10 @@ static apr_status_t vt_sdbm_store(apr_dbm_t *dbm, apr_datum_t key,
     apr_sdbm_datum_t kd, vd;
 
     kd.dptr = key.dptr;
-    kd.dsize = key.dsize;
+    kd.dsize = (int)key.dsize;
 
     vd.dptr = value.dptr;
-    vd.dsize = value.dsize;
+    vd.dsize = (int)value.dsize;
 
     rv = apr_sdbm_store(dbm->file, kd, vd, APR_SDBM_REPLACE);
 
@@ -143,7 +143,7 @@ static apr_status_t vt_sdbm_del(apr_dbm_t *dbm, apr_datum_t key)
     apr_sdbm_datum_t kd;
 
     kd.dptr = key.dptr;
-    kd.dsize = key.dsize;
+    kd.dsize = (int)key.dsize;
 
     rv = apr_sdbm_delete(dbm->file, kd);
 
@@ -157,7 +157,7 @@ static int vt_sdbm_exists(apr_dbm_t *dbm, apr_datum_t key)
     apr_sdbm_datum_t vd, kd;
 
     kd.dptr = key.dptr;
-    kd.dsize = key.dsize;
+    kd.dsize = (int)key.dsize;
 
     if (apr_sdbm_fetch(dbm->file, &vd, kd) != APR_SUCCESS)
         exists = 0;
diff --git a/dbm/sdbm/sdbm_pair.c b/dbm/sdbm/sdbm_pair.c
index 78a089ef..21302007 100644
--- a/dbm/sdbm/sdbm_pair.c
+++ b/dbm/sdbm/sdbm_pair.c
@@ -183,7 +183,7 @@ apr_sdbm_datum_t key;
 		register int m;
 		register char *dst = pag + (i == 1 ? PBLKSIZ : ino[i - 1]);
 		register char *src = pag + ino[i + 1];
-		register int   zoo = dst - src;
+		register short zoo = (short) (dst - src);
 
 		debug(("free-up %d ", zoo));
 /*