X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/1dda051bbae15d2f45db44e1828056b3f2e97285..813390c45f438f411662b1a55678e63f11681eb4:/key-error.h

diff --git a/key-error.h b/key-error.h
index 94b53c2..2029a2b 100644
--- a/key-error.h
+++ b/key-error.h
@@ -7,7 +7,7 @@
  * (c) 2004 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,12 +15,12 @@
  * 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,
@@ -36,24 +36,29 @@
 
 /*----- Error codes -------------------------------------------------------*/
 
+#define KEY_ERRORS(_)							\
+  _(OK,		  0, "No error")					\
+  _(BADTAG,	 -1, "Bad tag string")					\
+  _(BADTYPE,	 -2, "Bad type string")					\
+  _(BADCOMMENT,	 -3, "Bad comment string")				\
+  _(DUPID,	 -4, "Key id already exists")				\
+  _(DUPTAG,	 -5, "Key tag already exists")				\
+  _(READONLY,	 -6, "Key file is read-only")				\
+  _(WILLEXPIRE,	 -7, "Key will eventually expire")			\
+  _(EXPIRED,	 -8, "Key has expired")					\
+  _(BADFLAGS,	 -9, "Bad key flags string")				\
+  _(BADPASS,	-10, "Failed to unlock key")				\
+  _(WRONGTYPE,	-11, "Unexpected key encoding type")			\
+  _(NOTFOUND,	-12, "Key not found")					\
+  _(BADATTR,	-13, "Bad attribute name")				\
+  _(MALFORMED,	-14, "Malformed key data")				\
+  _(IO,		-15, "I/O error")					\
+
 enum {
-  KERR_OK = 0,				/* No error */
-  KERR_BADTAG = -1,			/* Malformed tag string */
-  KERR_BADTYPE = -2,			/* Malformed type string */
-  KERR_BADCOMMENT = -3,			/* Malformed comment string */
-  KERR_DUPID = -4,			/* Duplicate keyid */
-  KERR_DUPTAG = -5,			/* Duplicate key tag string */
-  KERR_READONLY = -6,			/* Key file is read-only */
-  KERR_WILLEXPIRE = -7,			/* Key will eventually expire */
-  KERR_EXPIRED = -8,			/* Key has already expired */
-  KERR_BADFLAGS = -9,			/* Error in flags string */
-  KERR_BADPASS = -10,			/* Error decrypting locked key */
-  KERR_WRONGTYPE = -11,			/* Key has incorrect type */
-  KERR_NOTFOUND = -12,			/* Key couldn't be found */
-  KERR_BADATTR = -13,			/* Malformed attribute name */
-  KERR_MALFORMED = -14,			/* Key data is malformed */
-  KERR_IO = -15,			/* I/O error of some kind */
-  KERR_MAX = -16			/* Not useful */
+#define ENTRY(tag, num, str) KERR_##tag = num,
+  KEY_ERRORS(ENTRY)
+#undef ENTRY
+  KERR__dummy
 };
 
 /*----- Functions provided ------------------------------------------------*/