Convert peer_update to just pass the peer object

Unlike get and insert, there is no need for an addres parameter that
needs to be normalized, since the address is already in the peer
object.

Co-authored-by: Richard Russon <rich@flatcap.org>

diff --git a/autocrypt/autocrypt.c b/autocrypt/autocrypt.c
index 3bebe9274f9cfb16c17404d30438b4610ad702d1..7fb1dbadfc40c0c16fb4db0848f877bf9a127bc4 100644 (file)
--- a/autocrypt/autocrypt.c
+++ b/autocrypt/autocrypt.c
@@ -314,7 +314,7 @@ int mutt_autocrypt_process_autocrypt_header(struct Email *e, struct Envelope *en
   if (insert_db && mutt_autocrypt_db_peer_insert(from, peer))
     goto cleanup;
 
-  if (update_db && mutt_autocrypt_db_peer_update(from, peer))
+  if (update_db && mutt_autocrypt_db_peer_update(peer))
     goto cleanup;
 
   if (insert_db_history)
@@ -451,7 +451,7 @@ int mutt_autocrypt_process_gossip_header(struct Email *hdr, struct Envelope *pro
     if (insert_db && mutt_autocrypt_db_peer_insert(peer_addr, peer))
       goto cleanup;
 
-    if (update_db && mutt_autocrypt_db_peer_update(peer_addr, peer))
+    if (update_db && mutt_autocrypt_db_peer_update(peer))
       goto cleanup;
 
     if (insert_db_history)

diff --git a/autocrypt/autocrypt_db.c b/autocrypt/autocrypt_db.c
index 5fd7281643bbb486177ba6aecb516634ba622b76..fc82cb1190eeb83ac2b8fc0a522139c4d34b8f3e 100644 (file)
--- a/autocrypt/autocrypt_db.c
+++ b/autocrypt/autocrypt_db.c
@@ -416,12 +416,9 @@ cleanup:
   return rv;
 }
 
-int mutt_autocrypt_db_peer_update(struct Address *addr, struct AutocryptPeer *peer)
+int mutt_autocrypt_db_peer_update(struct AutocryptPeer *peer)
 {
   int rv = -1;
-  struct Address *norm_addr = NULL;
-
-  norm_addr = copy_normalize_addr(addr);
 
   if (!PeerUpdateStmt)
   {
@@ -456,7 +453,7 @@ int mutt_autocrypt_db_peer_update(struct Address *addr, struct AutocryptPeer *pe
     goto cleanup;
   if (sqlite3_bind_text(PeerUpdateStmt, 8, peer->gossip_keydata, -1, SQLITE_STATIC) != SQLITE_OK)
     goto cleanup;
-  if (sqlite3_bind_text(PeerUpdateStmt, 9, norm_addr->mailbox, -1, SQLITE_STATIC) != SQLITE_OK)
+  if (sqlite3_bind_text(PeerUpdateStmt, 9, peer->email_addr, -1, SQLITE_STATIC) != SQLITE_OK)
     goto cleanup;
 
   if (sqlite3_step(PeerUpdateStmt) != SQLITE_DONE)
@@ -465,7 +462,6 @@ int mutt_autocrypt_db_peer_update(struct Address *addr, struct AutocryptPeer *pe
   rv = 0;
 
 cleanup:
-  mutt_addr_free(&norm_addr);
   sqlite3_reset(PeerUpdateStmt);
   return rv;
 }

diff --git a/autocrypt/autocrypt_private.h b/autocrypt/autocrypt_private.h
index 8481d4536638a434083309a9d8e981aafe6fdb54..c0838a0a8ce121f16a8f942fb7d18c59cfb78029 100644 (file)
--- a/autocrypt/autocrypt_private.h
+++ b/autocrypt/autocrypt_private.h
@@ -47,7 +47,7 @@ struct AutocryptPeer *mutt_autocrypt_db_peer_new (void);
 void mutt_autocrypt_db_peer_free (struct AutocryptPeer **peer);
 int mutt_autocrypt_db_peer_get (struct Address *addr, struct AutocryptPeer **peer);
 int mutt_autocrypt_db_peer_insert (struct Address *addr, struct AutocryptPeer *peer);
-int mutt_autocrypt_db_peer_update (struct Address *addr, struct AutocryptPeer *peer);
+int mutt_autocrypt_db_peer_update (struct AutocryptPeer *peer);
 
 struct AutocryptPeerHistory *mutt_autocrypt_db_peer_history_new (void);
 void mutt_autocrypt_db_peer_history_free (struct AutocryptPeerHistory **peerhist);