X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/9cea6911b24ae552b8804048d093490405ed0b69..213e565ffaaa420441d7a8d25f995358c5f9f30f:/dsig.c

diff --git a/dsig.c b/dsig.c
index c45d204..a8fc2f9 100644
--- a/dsig.c
+++ b/dsig.c
@@ -592,23 +592,6 @@ static const char *keyring = "keyring";
 
 /*----- Other shared functions --------------------------------------------*/
 
-/* --- @keyreport@ --- *
- *
- * Arguments:	@const char *file@ = filename containing the error
- *		@int line@ = line number in file
- *		@const char *err@ = error text message
- *		@void *p@ = unimportant pointer
- *
- * Returns:	---
- *
- * Use:		Reports errors during the opening of a key file.
- */
-
-static void keyreport(const char *file, int line, const char *err, void *p)
-{
-  moan("error in keyring `%s' at line `%s': %s", file, line, err);
-}
-
 /* --- @fhash@ --- *
  *
  * Arguments:	@const gchash *c@ = pointer to hash class
@@ -746,7 +729,7 @@ static int sign(int argc, char *argv[])
 
   /* --- Locate the signing key --- */
 
-  if (key_open(&kf, keyring, KOPEN_WRITE, keyreport, 0))
+  if (key_open(&kf, keyring, KOPEN_WRITE, key_moan, 0))
     die(EXIT_FAILURE, "couldn't open keyring `%s'", keyring);
   if ((k = key_bytag(&kf, ki)) == 0)
     die(EXIT_FAILURE, "couldn't find key `%s'", ki);
@@ -933,7 +916,7 @@ static int verify(int argc, char *argv[])
 
   /* --- Open the key file, and start reading the input file --- */
 
-  if (key_open(&kf, keyring, KOPEN_READ, keyreport, 0))
+  if (key_open(&kf, keyring, KOPEN_READ, key_moan, 0))
     die(EXIT_FAILURE, "couldn't open keyring `%s'\n", keyring);
   if (argc < 1)
     fp = stdin;