key-data.c (key_struct{set,steal}): Assert no other references.

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

diff --git a/key-error.c b/key-error.c
index 8ca934e..cd7d386 100644 (file)
--- a/key-error.c
+++ b/key-error.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: key-error.c,v 1.1 2000/02/12 18:21:02 mdw Exp $
+ * $Id$
  *
  * Translating key error codes into strings
  *
  * (c) 2000 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,29 +15,22 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * Catacomb is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with Catacomb; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: key-error.c,v $
- * 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 ---------------------------------------------------*/
 
@@ -53,22 +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",
-    "Bad key flags string",
+  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]);
 }