factorial: Fix usage message to fit in with conventions.

[u/mdw/catacomb] / key-error.c

diff --git a/key-error.c b/key-error.c
index 75e4246..b4f8ffe 100644 (file)
--- a/key-error.c
+++ b/key-error.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: key-error.c,v 1.4 2004/04/08 01:36:15 mdw Exp $
+ * $Id$
  *
  * Translating key error codes into strings
  *
@@ -30,7 +30,7 @@
 /*----- Header files ------------------------------------------------------*/
 
 #include <mLib/macros.h>
-#include "key.h"
+#include "key-error.h"
 
 /*----- Error reporting ---------------------------------------------------*/
 
@@ -46,27 +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",
-    "Bad attribute name",
+  static const char *const tab[] = {
+#define ENTRY(tag, num, str) str,
+    KEY_ERRORS(ENTRY)
+#undef ENTRY
     "Unknown error code"
   };
   
   unsigned e = -err;
   if (e >= N(tab))
-    e = N(tab);
+    e = N(tab) - 1;
  return (tab[e]);
 }