Several signed/unsigned warning fixes.
This commit is contained in:
parent
669697b4ea
commit
f60486b3ce
@ -197,7 +197,7 @@ delete: if (__bt_dleaf(t, key, h, idx) == RET_ERROR) {
|
|||||||
* into the offset array, shift the pointers up.
|
* into the offset array, shift the pointers up.
|
||||||
*/
|
*/
|
||||||
nbytes = NBLEAFDBT(key->size, data->size);
|
nbytes = NBLEAFDBT(key->size, data->size);
|
||||||
if (h->upper - h->lower < nbytes + sizeof(indx_t)) {
|
if ((u_int32_t)(h->upper - h->lower) < nbytes + sizeof(indx_t)) {
|
||||||
if ((status = __bt_split(t, h, key,
|
if ((status = __bt_split(t, h, key,
|
||||||
data, dflags, nbytes, idx)) != RET_SUCCESS)
|
data, dflags, nbytes, idx)) != RET_SUCCESS)
|
||||||
return (status);
|
return (status);
|
||||||
@ -278,7 +278,7 @@ bt_fast(BTREE *t, const DBT *key, const DBT *data, int *exactp)
|
|||||||
* have to search to get split stack.
|
* have to search to get split stack.
|
||||||
*/
|
*/
|
||||||
nbytes = NBLEAFDBT(key->size, data->size);
|
nbytes = NBLEAFDBT(key->size, data->size);
|
||||||
if (h->upper - h->lower < nbytes + sizeof(indx_t))
|
if ((u_int32_t)(h->upper - h->lower) < nbytes + sizeof(indx_t))
|
||||||
goto miss;
|
goto miss;
|
||||||
|
|
||||||
if (t->bt_order == FORWARD) {
|
if (t->bt_order == FORWARD) {
|
||||||
|
@ -205,7 +205,7 @@ __bt_split(BTREE *t, PAGE *sp, const DBT *key, const DBT *data, int flags,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Split the parent page if necessary or shift the indices. */
|
/* Split the parent page if necessary or shift the indices. */
|
||||||
if (h->upper - h->lower < nbytes + sizeof(indx_t)) {
|
if ((u_int32_t)(h->upper - h->lower) < nbytes + sizeof(indx_t)) {
|
||||||
sp = h;
|
sp = h;
|
||||||
h = h->pgno == P_ROOT ?
|
h = h->pgno == P_ROOT ?
|
||||||
bt_root(t, h, &l, &r, &skip, nbytes) :
|
bt_root(t, h, &l, &r, &skip, nbytes) :
|
||||||
|
@ -164,7 +164,7 @@ __hash_open(const char *file, int flags, int mode,
|
|||||||
if (hashp->VERSION != HASHVERSION &&
|
if (hashp->VERSION != HASHVERSION &&
|
||||||
hashp->VERSION != OLDHASHVERSION)
|
hashp->VERSION != OLDHASHVERSION)
|
||||||
RETURN_ERROR(EFTYPE, error1);
|
RETURN_ERROR(EFTYPE, error1);
|
||||||
if (hashp->hash(CHARKEY, sizeof(CHARKEY)) != hashp->H_CHARKEY)
|
if ((int32_t)hashp->hash(CHARKEY, sizeof(CHARKEY)) != hashp->H_CHARKEY)
|
||||||
RETURN_ERROR(EFTYPE, error1);
|
RETURN_ERROR(EFTYPE, error1);
|
||||||
/*
|
/*
|
||||||
* Figure out how many segments we need. Max_Bucket is the
|
* Figure out how many segments we need. Max_Bucket is the
|
||||||
@ -736,7 +736,7 @@ hash_seq(const DB *dbp, DBT *key, DBT *data, u_int32_t flag)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
hashp->cbucket = bucket;
|
hashp->cbucket = bucket;
|
||||||
if (hashp->cbucket > hashp->MAX_BUCKET) {
|
if ((u_int32_t)hashp->cbucket > hashp->MAX_BUCKET) {
|
||||||
hashp->cbucket = -1;
|
hashp->cbucket = -1;
|
||||||
return (ABNORMAL);
|
return (ABNORMAL);
|
||||||
}
|
}
|
||||||
@ -858,7 +858,7 @@ hash_realloc(SEGMENT **p_ptr, int oldsize, int newsize)
|
|||||||
u_int32_t
|
u_int32_t
|
||||||
__call_hash(HTAB *hashp, char *k, int len)
|
__call_hash(HTAB *hashp, char *k, int len)
|
||||||
{
|
{
|
||||||
int n, bucket;
|
unsigned int n, bucket;
|
||||||
|
|
||||||
n = hashp->hash(k, len);
|
n = hashp->hash(k, len);
|
||||||
bucket = n & hashp->HIGH_MASK;
|
bucket = n & hashp->HIGH_MASK;
|
||||||
|
@ -71,11 +71,11 @@ typedef struct hashhdr { /* Disk resident portion */
|
|||||||
int32_t ovfl_point; /* Where overflow pages are being
|
int32_t ovfl_point; /* Where overflow pages are being
|
||||||
* allocated */
|
* allocated */
|
||||||
int32_t last_freed; /* Last overflow page freed */
|
int32_t last_freed; /* Last overflow page freed */
|
||||||
int32_t max_bucket; /* ID of Maximum bucket in use */
|
u_int32_t max_bucket; /* ID of Maximum bucket in use */
|
||||||
int32_t high_mask; /* Mask to modulo into entire table */
|
u_int32_t high_mask; /* Mask to modulo into entire table */
|
||||||
int32_t low_mask; /* Mask to modulo into lower half of
|
u_int32_t low_mask; /* Mask to modulo into lower half of
|
||||||
* table */
|
* table */
|
||||||
int32_t ffactor; /* Fill factor */
|
u_int32_t ffactor; /* Fill factor */
|
||||||
int32_t nkeys; /* Number of keys in hash table */
|
int32_t nkeys; /* Number of keys in hash table */
|
||||||
int32_t hdrpages; /* Size of table header */
|
int32_t hdrpages; /* Size of table header */
|
||||||
int32_t h_charkey; /* value of hash(CHARKEY) */
|
int32_t h_charkey; /* value of hash(CHARKEY) */
|
||||||
|
@ -86,7 +86,8 @@ int
|
|||||||
__big_insert(HTAB *hashp, BUFHEAD *bufp, const DBT *key, const DBT *val)
|
__big_insert(HTAB *hashp, BUFHEAD *bufp, const DBT *key, const DBT *val)
|
||||||
{
|
{
|
||||||
u_int16_t *p;
|
u_int16_t *p;
|
||||||
int key_size, n, val_size;
|
int key_size, n;
|
||||||
|
unsigned int val_size;
|
||||||
u_int16_t space, move_bytes, off;
|
u_int16_t space, move_bytes, off;
|
||||||
char *cp, *key_data, *val_data;
|
char *cp, *key_data, *val_data;
|
||||||
|
|
||||||
|
@ -36,9 +36,10 @@ static char sccsid[] = "@(#)hash_log2.c 8.2 (Berkeley) 5/31/94";
|
|||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
__FBSDID("$FreeBSD$");
|
__FBSDID("$FreeBSD$");
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
|
|
||||||
#include <db.h>
|
#include <db.h>
|
||||||
|
#include "hash.h"
|
||||||
|
#include "page.h"
|
||||||
|
#include "extern.h"
|
||||||
|
|
||||||
u_int32_t
|
u_int32_t
|
||||||
__log2(u_int32_t num)
|
__log2(u_int32_t num)
|
||||||
|
@ -150,7 +150,7 @@ __rec_sync(const DB *dbp, u_int flags)
|
|||||||
status = (dbp->seq)(dbp, &key, &data, R_FIRST);
|
status = (dbp->seq)(dbp, &key, &data, R_FIRST);
|
||||||
while (status == RET_SUCCESS) {
|
while (status == RET_SUCCESS) {
|
||||||
if (_write(t->bt_rfd, data.data, data.size) !=
|
if (_write(t->bt_rfd, data.data, data.size) !=
|
||||||
data.size)
|
(ssize_t)data.size)
|
||||||
return (RET_ERROR);
|
return (RET_ERROR);
|
||||||
status = (dbp->seq)(dbp, &key, &data, R_NEXT);
|
status = (dbp->seq)(dbp, &key, &data, R_NEXT);
|
||||||
}
|
}
|
||||||
@ -162,7 +162,7 @@ __rec_sync(const DB *dbp, u_int flags)
|
|||||||
while (status == RET_SUCCESS) {
|
while (status == RET_SUCCESS) {
|
||||||
iov[0].iov_base = data.data;
|
iov[0].iov_base = data.data;
|
||||||
iov[0].iov_len = data.size;
|
iov[0].iov_len = data.size;
|
||||||
if (_writev(t->bt_rfd, iov, 2) != data.size + 1)
|
if (_writev(t->bt_rfd, iov, 2) != (ssize_t)(data.size + 1))
|
||||||
return (RET_ERROR);
|
return (RET_ERROR);
|
||||||
status = (dbp->seq)(dbp, &key, &data, R_NEXT);
|
status = (dbp->seq)(dbp, &key, &data, R_NEXT);
|
||||||
}
|
}
|
||||||
|
@ -251,7 +251,7 @@ __rec_iput(BTREE *t, recno_t nrec, const DBT *data, u_int flags)
|
|||||||
* the offset array, shift the pointers up.
|
* the offset array, shift the pointers up.
|
||||||
*/
|
*/
|
||||||
nbytes = NRLEAFDBT(data->size);
|
nbytes = NRLEAFDBT(data->size);
|
||||||
if (h->upper - h->lower < nbytes + sizeof(indx_t)) {
|
if ((u_int32_t)(h->upper - h->lower) < nbytes + sizeof(indx_t)) {
|
||||||
status = __bt_split(t, h, NULL, data, dflags, nbytes, idx);
|
status = __bt_split(t, h, NULL, data, dflags, nbytes, idx);
|
||||||
if (status == RET_SUCCESS)
|
if (status == RET_SUCCESS)
|
||||||
++t->bt_nrecs;
|
++t->bt_nrecs;
|
||||||
|
Loading…
Reference in New Issue
Block a user