Rename directory_pair to spool

1 files changed, 5 insertions, 5 deletions

diff --git a/src/gpg.c b/src/gpg.c
index 327ff77..453a908 100644
--- a/src/gpg.c
+++ b/src/gpg.c
@@ -199,10 +199,10 @@ gpg_sig_ok_p (gpgme_ctx_t ctx, gpgme_signature_t sig)
 }
 
 /* Verify the directive file from TRP using public key PUBKEY */
-/* FIXME: dpair currently unused */
+/* FIXME: spool currently unused */
 int
 verify_directive_signature (struct file_triplet *trp,
-			    struct directory_pair *dpair, const char *pubkey)
+			    struct spool *spool, const char *pubkey)
 {
   gpgme_ctx_t ctx;
   gpgme_data_t key_data, directive_data, plain;
@@ -237,7 +237,7 @@ verify_directive_signature (struct file_triplet *trp,
       if (!gpg_sig_ok_p (ctx, result->signatures))
 	{
 	  UPDATE_STATS (STAT_BAD_SIGNATURE);
-	  notify (dpair->notification, trp, ev_bad_directive_signature);
+	  notify (spool->notification, trp, ev_bad_directive_signature);
 	  rc = 1;
 	}
     }
@@ -260,7 +260,7 @@ verify_directive_signature (struct file_triplet *trp,
    a previous call to verify_directive_signature). */
 int
 verify_detached_signature (struct file_triplet *trp,
-			   struct directory_pair *dpair)
+			   struct spool *spool)
 {
   gpgme_engine_info_t info;
   const char *argv[5];
@@ -293,7 +293,7 @@ verify_detached_signature (struct file_triplet *trp,
     case exec_fail:
       UPDATE_STATS (STAT_BAD_SIGNATURE);
       logmsg (LOG_ERR, "BAD detached signature for %s", trp->name);
-      notify (dpair->notification, trp, ev_bad_detached_signature);
+      notify (spool->notification, trp, ev_bad_detached_signature);
       break;
 
     case exec_error: