X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/5b3f77c7fbafb036d20a1577ed74f475e94ed821..1a72b8d85895fc9ffba0d8f6a9240634ce6ee8dc:/keydb_pg.c

diff --git a/keydb_pg.c b/keydb_pg.c
index eee3bde..25881c0 100644
--- a/keydb_pg.c
+++ b/keydb_pg.c
@@ -259,6 +259,75 @@ static int pg_fetch_key_text(const char *search,
 	return (numkeys);
 }
 
+/**
+ *	delete_key - Given a keyid delete the key from storage.
+ *	@keyid: The keyid to delete.
+ *	@intrans: If we're already in a transaction.
+ *
+ *	This function deletes a public key from whatever storage mechanism we
+ *	are using. Returns 0 if the key existed.
+ */
+static int pg_delete_key(uint64_t keyid, bool intrans)
+{
+	PGresult *result = NULL;
+	char *oids = NULL;
+	char statement[1024];
+	int found = 1;
+	int i;
+	Oid key_oid;
+
+	if (!intrans) {
+		result = PQexec(dbconn, "BEGIN");
+		PQclear(result);
+	}
+	
+	snprintf(statement, 1023,
+			"SELECT keydata FROM onak_keys WHERE keyid = '%llX'",
+			keyid);
+	result = PQexec(dbconn, statement);
+
+	if (PQresultStatus(result) == PGRES_TUPLES_OK) {
+		found = 0;
+		i = PQntuples(result);
+		while (i > 0) {
+			oids = PQgetvalue(result, i-1, 0);
+			key_oid = (Oid) atoi(oids);
+			lo_unlink(dbconn, key_oid);
+			i--;
+		}
+		PQclear(result);
+
+		snprintf(statement, 1023,
+			"DELETE FROM onak_keys WHERE keyid = '%llX'",
+			keyid);
+		result = PQexec(dbconn, statement);
+		PQclear(result);
+
+		snprintf(statement, 1023,
+			"DELETE FROM onak_sigs WHERE signee = '%llX'",
+			keyid);
+		result = PQexec(dbconn, statement);
+		PQclear(result);
+
+		snprintf(statement, 1023,
+			"DELETE FROM onak_uids WHERE keyid = '%llX'",
+			keyid);
+		result = PQexec(dbconn, statement);
+	} else if (PQresultStatus(result) != PGRES_TUPLES_OK) {
+		logthing(LOGTHING_ERROR,
+				"Problem retrieving key (%llX) from DB.",
+				keyid);
+	}
+
+	PQclear(result);
+
+	if (!intrans) {
+		result = PQexec(dbconn, "COMMIT");
+		PQclear(result);
+	}
+	return (found);
+}
+
 /**
  *	store_key - Takes a key and stores it.
  *	@publickey: A pointer to the public key to store.
@@ -395,75 +464,6 @@ static int pg_store_key(struct openpgp_publickey *publickey, bool intrans,
 	return 0;
 }
 
-/**
- *	delete_key - Given a keyid delete the key from storage.
- *	@keyid: The keyid to delete.
- *	@intrans: If we're already in a transaction.
- *
- *	This function deletes a public key from whatever storage mechanism we
- *	are using. Returns 0 if the key existed.
- */
-static int pg_delete_key(uint64_t keyid, bool intrans)
-{
-	PGresult *result = NULL;
-	char *oids = NULL;
-	char statement[1024];
-	int found = 1;
-	int i;
-	Oid key_oid;
-
-	if (!intrans) {
-		result = PQexec(dbconn, "BEGIN");
-		PQclear(result);
-	}
-	
-	snprintf(statement, 1023,
-			"SELECT keydata FROM onak_keys WHERE keyid = '%llX'",
-			keyid);
-	result = PQexec(dbconn, statement);
-
-	if (PQresultStatus(result) == PGRES_TUPLES_OK) {
-		found = 0;
-		i = PQntuples(result);
-		while (i > 0) {
-			oids = PQgetvalue(result, i-1, 0);
-			key_oid = (Oid) atoi(oids);
-			lo_unlink(dbconn, key_oid);
-			i--;
-		}
-		PQclear(result);
-
-		snprintf(statement, 1023,
-			"DELETE FROM onak_keys WHERE keyid = '%llX'",
-			keyid);
-		result = PQexec(dbconn, statement);
-		PQclear(result);
-
-		snprintf(statement, 1023,
-			"DELETE FROM onak_sigs WHERE signee = '%llX'",
-			keyid);
-		result = PQexec(dbconn, statement);
-		PQclear(result);
-
-		snprintf(statement, 1023,
-			"DELETE FROM onak_uids WHERE keyid = '%llX'",
-			keyid);
-		result = PQexec(dbconn, statement);
-	} else if (PQresultStatus(result) != PGRES_TUPLES_OK) {
-		logthing(LOGTHING_ERROR,
-				"Problem retrieving key (%llX) from DB.",
-				keyid);
-	}
-
-	PQclear(result);
-
-	if (!intrans) {
-		result = PQexec(dbconn, "COMMIT");
-		PQclear(result);
-	}
-	return (found);
-}
-
 /**
  *	keyid2uid - Takes a keyid and returns the primary UID for it.
  *	@keyid: The keyid to lookup.