X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/86a47753c5ed92211c3d6f5dcf47a1cfb85031a8..02dfbd5b7af7816959dbd39c1fe628451204e35f:/key-error.c

diff --git a/key-error.c b/key-error.c
index 7b72d44..b4f8ffe 100644
--- a/key-error.c
+++ b/key-error.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: key-error.c,v 1.2 2000/02/12 18:55:40 mdw Exp $
+ * $Id$
  *
  * Translating key error codes into strings
  *
@@ -27,20 +27,10 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: key-error.c,v $
- * Revision 1.2  2000/02/12 18:55:40  mdw
- * Make it all compile properly.
- *
- * Revision 1.1  2000/02/12 18:21:02  mdw
- * Overhaul of key management (again).
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
-#include "key.h"
+#include <mLib/macros.h>
+#include "key-error.h"
 
 /*----- Error reporting ---------------------------------------------------*/
 
@@ -56,26 +46,16 @@
 
 const char *key_strerror(int err)
 {
-  char *tab[] = {
-    "No error",
-    "Bad tag string",
-    "Bad type string",
-    "Bad comment string",
-    "Keyid already exists",
-    "Key tag already exists",
-    "Key file is read-only",
-    "Key will eventually expire",
-    "Key has expired",
-    "Bad key flags string",
-    "Failed to unlock encrypted key",
-    "Unexpected key encoding type",
-    "Key not found",
+  static const char *const tab[] = {
+#define ENTRY(tag, num, str) str,
+    KEY_ERRORS(ENTRY)
+#undef ENTRY
     "Unknown error code"
   };
   
   unsigned e = -err;
-  if (e >= KERR_MAX)
-    e = KERR_MAX;
+  if (e >= N(tab))
+    e = N(tab) - 1;
  return (tab[e]);
 }