aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranklin Wei <me@fwei.tk>2018-07-03 16:03:24 -0400
committerFranklin Wei <me@fwei.tk>2018-07-03 16:03:24 -0400
commit626224ade749f4429d5c098d8f27798da8405ca1 (patch)
tree70a7a9e818a807df3b447637b0b2dd40282a8f0a
parentb48c8121de03fd5da77976d710e92d1566e2d143 (diff)
downloadcsaa-626224ade749f4429d5c098d8f27798da8405ca1.zip
csaa-626224ade749f4429d5c098d8f27798da8405ca1.tar.gz
csaa-626224ade749f4429d5c098d8f27798da8405ca1.tar.bz2
csaa-626224ade749f4429d5c098d8f27798da8405ca1.tar.xz
Make constants all 64-bit
-rw-r--r--crypto.c4
-rw-r--r--iomt.c12
2 files changed, 8 insertions, 8 deletions
diff --git a/crypto.c b/crypto.c
index e51b502..c965b1e 100644
--- a/crypto.c
+++ b/crypto.c
@@ -146,7 +146,7 @@ uint64_t *bintree_complement(uint64_t leafidx, int logleaves, int **orders)
*orders = calloc(logleaves, sizeof(int));
/* true index of leaf */
- uint64_t idx = (1 << logleaves) - 1 + leafidx;
+ uint64_t idx = ((uint64_t)1 << logleaves) - 1 + leafidx;
/* progress up the tree */
for(int i = 0; i < logleaves; ++i)
@@ -169,7 +169,7 @@ uint64_t *bintree_ancestors(uint64_t leafidx, int logleaves)
{
uint64_t *dep = calloc(logleaves, sizeof(uint64_t));
- uint64_t idx = (1 << logleaves) - 1 + leafidx;
+ uint64_t idx = ((uint64_t)1 << logleaves) - 1 + leafidx;
for(int i = 0; i < logleaves; ++i)
{
idx = bintree_parent(idx);
diff --git a/iomt.c b/iomt.c
index 9fe48e4..f79a0c4 100644
--- a/iomt.c
+++ b/iomt.c
@@ -189,15 +189,15 @@ void iomt_fill(struct iomt *tree)
{
for(uint64_t i = 0; i < tree->mt_leafcount; ++i)
{
- uint64_t mt_idx = (1 << tree->mt_logleaves) - 1 + i;
+ uint64_t mt_idx = ((uint64_t)1 << tree->mt_logleaves) - 1 + i;
iomt_setnode(tree, mt_idx, hash_node(iomt_getleaf(tree, i)));
}
/* now loop up from the bottom level, calculating the parent of
* each pair of nodes */
for(int i = tree->mt_logleaves - 1; i >= 0; --i)
{
- uint64_t baseidx = (1 << i) - 1;
- for(uint64_t j = 0; j < (1 << i); ++j)
+ uint64_t baseidx = ((uint64_t)1 << i) - 1;
+ for(uint64_t j = 0; j < ((uint64_t)1 << i); ++j)
{
uint64_t mt_idx = baseidx + j;
iomt_setnode(tree, mt_idx, merkle_parent(iomt_getnode(tree, 2 * mt_idx + 1),
@@ -240,7 +240,7 @@ void merkle_update(struct iomt *tree, uint64_t leafidx, hash_t newval, hash_t **
if(old_dep)
*old_dep = calloc(tree->mt_logleaves, sizeof(hash_t));
- uint64_t idx = (1 << tree->mt_logleaves) - 1 + leafidx;
+ uint64_t idx = ((uint64_t)1 << tree->mt_logleaves) - 1 + leafidx;
iomt_setnode(tree, idx, newval);
for(int i = 0; i < tree->mt_logleaves; ++i)
@@ -438,7 +438,7 @@ struct iomt *iomt_new(int logleaves)
tree->in_memory = true;
- tree->mt_leafcount = 1UL << logleaves;
+ tree->mt_leafcount = (uint64_t)1 << logleaves;
tree->mt_logleaves = logleaves;
tree->mem.mt_leaves = calloc(tree->mt_leafcount, sizeof(struct iomt_node));
@@ -500,7 +500,7 @@ struct iomt *iomt_new_from_db(void *db,
tree->in_memory = false;
- tree->mt_leafcount = 1UL << logleaves;
+ tree->mt_leafcount = (uint64_t)1 << logleaves;
tree->mt_logleaves = logleaves;
tree->db.db = db;