X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/a241edc87bed49d6bc5dc3c4c99786a921ae7c8a..0e200cff842e99726480278f5d7862cb3e2d82ac:/keydb_db4.c

diff --git a/keydb_db4.c b/keydb_db4.c
index 638be28..4e35bff 100644
--- a/keydb_db4.c
+++ b/keydb_db4.c
@@ -887,7 +887,7 @@ static int db4_delete_key(uint64_t keyid, bool intrans)
 			worddb_data[ 8] = (keyid >> 24) & 0xFF;
 			worddb_data[ 9] = (keyid >> 16) & 0xFF;
 			worddb_data[10] = (keyid >>  8) & 0xFF;
-			worddb_data[11] = keyid & 0xFF; 
+			worddb_data[11] = keyid & 0xFF;
 
 			ret = cursor->c_get(cursor,
 				&key,
@@ -896,17 +896,14 @@ static int db4_delete_key(uint64_t keyid, bool intrans)
 
 			if (ret == 0) {
 				ret = cursor->c_del(cursor, 0);
-				if (ret != 0) {
-					logthing(LOGTHING_ERROR,
-						"Problem deleting word: %s",
-						db_strerror(ret));
-				}
 			}
 
 			if (ret != 0) {
 				logthing(LOGTHING_ERROR,
-					"Problem deleting word: %s",
-					db_strerror(ret));
+					"Problem deleting word: %s "
+					"(0x%016" PRIX64 ")",
+					db_strerror(ret),
+					keyid);
 				if (ret == DB_LOCK_DEADLOCK) {
 					deadlock = true;
 				}
@@ -951,17 +948,14 @@ static int db4_delete_key(uint64_t keyid, bool intrans)
 
 		if (ret == 0) {
 			ret = cursor->c_del(cursor, 0);
-			if (ret != 0) {
-				logthing(LOGTHING_ERROR,
-					"Problem deleting short keyid: %s",
-					db_strerror(ret));
-			}
 		}
 
 		if (ret != 0) {
 			logthing(LOGTHING_ERROR,
-				"Problem deleting short keyid: %s",
-				db_strerror(ret));
+				"Problem deleting short keyid: %s ",
+				"(0x%016" PRIX64 ")",
+				db_strerror(ret),
+				keyid);
 			if (ret == DB_LOCK_DEADLOCK) {
 				deadlock = true;
 			}
@@ -986,18 +980,14 @@ static int db4_delete_key(uint64_t keyid, bool intrans)
 
 			if (ret == 0) {
 				ret = cursor->c_del(cursor, 0);
-				if (ret != 0) {
-					logthing(LOGTHING_ERROR,
-						"Problem deleting short"
-						" keyid: %s",
-						db_strerror(ret));
-				}
 			}
 
 			if (ret != 0) {
 				logthing(LOGTHING_ERROR,
-					"Problem deleting short keyid: %s",
-					db_strerror(ret));
+					"Problem deleting short keyid: %s ",
+					"(0x%016" PRIX64 ")",
+					db_strerror(ret),
+					keyid);
 				if (ret == DB_LOCK_DEADLOCK) {
 					deadlock = true;
 				}
@@ -1013,6 +1003,10 @@ static int db4_delete_key(uint64_t keyid, bool intrans)
 	}
 
 	if (!deadlock) {
+		ret = skshashdb->cursor(skshashdb,
+			txn,
+			&cursor,
+			0);   /* flags */
 		get_skshash(publickey, &hash);
 
 		memset(&key, 0, sizeof(key));
@@ -1033,8 +1027,10 @@ static int db4_delete_key(uint64_t keyid, bool intrans)
 
 		if (ret != 0) {
 			logthing(LOGTHING_ERROR,
-				"Problem deleting skshash: %s",
-				db_strerror(ret));
+				"Problem deleting skshash: %s ",
+				"(0x%016" PRIX64 ")",
+				db_strerror(ret),
+				keyid);
 			if (ret == DB_LOCK_DEADLOCK) {
 				deadlock = true;
 			}