X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_db4.c;h=1f306e267f60e9851c0dd65b0874517ba7afcb39;hb=c3fe49f62ac8d87e4e0ac836891792e9c10035a2;hp=df07769ee224030291e831f034d1e3e4696e7d55;hpb=d7d1077c759ec370ef776eba1d855837b3d6c597;p=onak.git

diff --git a/keydb_db4.c b/keydb_db4.c
index df07769..1f306e2 100644
--- a/keydb_db4.c
+++ b/keydb_db4.c
@@ -72,10 +72,13 @@ DB *keydb_fp(struct onak_db4_dbctx *privctx, struct openpgp_fingerprint *fp)
 {
 	uint64_t keytrun;
 
-	keytrun = (fp->fp[4] << 24) |
-			(fp->fp[5] << 16) |
-			(fp->fp[6] <<  8) |
-			(fp->fp[7]);
+	keytrun = fp->fp[4];
+	keytrun <<= 8;
+	keytrun |= fp->fp[5];
+	keytrun <<= 8;
+	keytrun |= fp->fp[6];
+	keytrun <<= 8;
+	keytrun |= fp->fp[7];
 
 	return(privctx->dbconns[keytrun % privctx->numdbs]);
 }
@@ -400,7 +403,6 @@ static int db4_fetch_key_id(struct onak_dbctx *dbctx, uint64_t keyid,
 		bool intrans)
 {
 	struct onak_db4_dbctx *privctx = (struct onak_db4_dbctx *) dbctx->priv;
-	struct openpgp_packet_list *packets = NULL;
 	DBT key, data;
 	DBC *cursor = NULL;
 	int ret = 0;
@@ -487,7 +489,6 @@ static int db4_fetch_key_text(struct onak_dbctx *dbctx, const char *search,
 	DBC *cursor = NULL;
 	DBT key, data;
 	int ret;
-	uint64_t keyid;
 	int i;
 	int numkeys;
 	char *searchtext = NULL;
@@ -592,7 +593,6 @@ static int db4_fetch_key_skshash(struct onak_dbctx *dbctx,
 	struct onak_db4_dbctx *privctx = (struct onak_db4_dbctx *) dbctx->priv;
 	DBT       key, data;
 	DBC      *cursor = NULL;
-	uint64_t  keyid = 0;
 	int       ret;
 	int       count = 0;
 	struct openpgp_fingerprint fingerprint;