Remove obsolete error code.

* doc/gdbm.texi: Remove description of GDBM_UNKNOWN_UPDATE.
Document GDBM_DIR_OVERFLOW.
* src/gdbm.h.in (GDBM_ERR_DIR_OVERFLOW): Rename to GDBM_DIR_OVERFLOW.
(GDBM_UNKNOWN_ERROR): New error code.
(GDBM_UNKNOWN_UPDATE): Define to GDBM_UNKNOWN_ERROR for
backward compatibility.
* src/gdbmerrno.c (gdbm_strerror, gdbm_db_strerror): Simplify a bit

3 files changed, 42 insertions, 53 deletions

diff --git a/src/bucket.c b/src/bucket.c
index 9e650e3..6e3debe 100644
--- a/src/bucket.c
+++ b/src/bucket.c
@@ -251,7 +251,7 @@ _gdbm_split_bucket (GDBM_FILE dbf, int next_insert)
 	{
 	  if (dbf->header->dir_size >= GDBM_MAX_DIR_HALF)
 	    {
-	      GDBM_SET_ERRNO (dbf, GDBM_ERR_DIR_OVERFLOW, TRUE);
+	      GDBM_SET_ERRNO (dbf, GDBM_DIR_OVERFLOW, TRUE);
 	      _gdbm_fatal (dbf, _("directory overflow"));
 	      return -1;
 	    }
diff --git a/src/gdbm.h.in b/src/gdbm.h.in
index 5d40145..17b75b0 100644
--- a/src/gdbm.h.in
+++ b/src/gdbm.h.in
@@ -186,43 +186,46 @@ extern int gdbm_load_from_file (GDBM_FILE *, FILE *, int replace,
 
 extern int gdbm_copy_meta (GDBM_FILE dst, GDBM_FILE src);
 
-# define GDBM_NO_ERROR		0
-# define GDBM_MALLOC_ERROR	1
-# define GDBM_BLOCK_SIZE_ERROR	2
-# define GDBM_FILE_OPEN_ERROR	3
-# define GDBM_FILE_WRITE_ERROR	4
-# define GDBM_FILE_SEEK_ERROR	5
-# define GDBM_FILE_READ_ERROR	6
-# define GDBM_BAD_MAGIC_NUMBER	7
-# define GDBM_EMPTY_DATABASE	8
-# define GDBM_CANT_BE_READER	9
-# define GDBM_CANT_BE_WRITER	10
+# define GDBM_NO_ERROR		         0
+# define GDBM_MALLOC_ERROR	         1
+# define GDBM_BLOCK_SIZE_ERROR	         2
+# define GDBM_FILE_OPEN_ERROR	         3
+# define GDBM_FILE_WRITE_ERROR	         4
+# define GDBM_FILE_SEEK_ERROR	         5
+# define GDBM_FILE_READ_ERROR	         6
+# define GDBM_BAD_MAGIC_NUMBER	         7
+# define GDBM_EMPTY_DATABASE	         8
+# define GDBM_CANT_BE_READER	         9
+# define GDBM_CANT_BE_WRITER	        10
 # define GDBM_READER_CANT_DELETE	11
-# define GDBM_READER_CANT_STORE	12
+# define GDBM_READER_CANT_STORE	        12
 # define GDBM_READER_CANT_REORGANIZE	13
-# define GDBM_UNKNOWN_UPDATE	14
-# define GDBM_ITEM_NOT_FOUND	15
-# define GDBM_REORGANIZE_FAILED	16
-# define GDBM_CANNOT_REPLACE	17
-# define GDBM_ILLEGAL_DATA	18
-# define GDBM_OPT_ALREADY_SET	19
-# define GDBM_OPT_ILLEGAL	20
-# define GDBM_BYTE_SWAPPED	21
-# define GDBM_BAD_FILE_OFFSET	22
-# define GDBM_BAD_OPEN_FLAGS	23
-# define GDBM_FILE_STAT_ERROR   24
-# define GDBM_FILE_EOF          25
-# define GDBM_NO_DBNAME         26
-# define GDBM_ERR_FILE_OWNER    27
-# define GDBM_ERR_FILE_MODE     28
-# define GDBM_NEED_RECOVERY     29
-# define GDBM_BACKUP_FAILED     30
-# define GDBM_ERR_DIR_OVERFLOW  31
+# define GDBM_ERR_UNKNOWN_ERROR	        14
+# define GDBM_ITEM_NOT_FOUND	        15
+# define GDBM_REORGANIZE_FAILED	        16
+# define GDBM_CANNOT_REPLACE	        17
+# define GDBM_ILLEGAL_DATA	        18
+# define GDBM_OPT_ALREADY_SET	        19
+# define GDBM_OPT_ILLEGAL           	20
+# define GDBM_BYTE_SWAPPED	        21
+# define GDBM_BAD_FILE_OFFSET	        22
+# define GDBM_BAD_OPEN_FLAGS	        23
+# define GDBM_FILE_STAT_ERROR           24
+# define GDBM_FILE_EOF                  25
+# define GDBM_NO_DBNAME                 26
+# define GDBM_ERR_FILE_OWNER            27
+# define GDBM_ERR_FILE_MODE             28
+# define GDBM_NEED_RECOVERY             29
+# define GDBM_BACKUP_FAILED             30
+# define GDBM_DIR_OVERFLOW              31
 
 # define _GDBM_MIN_ERRNO	0
-# define _GDBM_MAX_ERRNO	GDBM_ERR_DIR_OVERFLOW
+# define _GDBM_MAX_ERRNO	GDBM_DIR_OVERFLOW
 
-typedef int gdbm_error;		/* For compatibilities sake. */
+/* This one was never used and will be removed in the future */
+# define GDBM_UNKNOWN_UPDATE GDBM_ERR_UNKNOWN_ERROR
+  
+typedef int gdbm_error;
 extern gdbm_error gdbm_errno;
 extern const char * const gdbm_errlist[];
 extern int const gdbm_syserr[];
diff --git a/src/gdbmerrno.c b/src/gdbmerrno.c
index e2eadd6..424c3d5 100644
--- a/src/gdbmerrno.c
+++ b/src/gdbmerrno.c
@@ -107,7 +107,7 @@ const char * const gdbm_errlist[_GDBM_MAX_ERRNO+1] = {
   [GDBM_READER_CANT_DELETE]     = N_("Reader can't delete"),
   [GDBM_READER_CANT_STORE]      = N_("Reader can't store"),
   [GDBM_READER_CANT_REORGANIZE] = N_("Reader can't reorganize"),
-  [GDBM_UNKNOWN_UPDATE]         = N_("Unknown update"),
+  [GDBM_UNKNOWN_ERRNO]          = N_("Should not happen: unused error code"),
   [GDBM_ITEM_NOT_FOUND]         = N_("Item not found"),
   [GDBM_REORGANIZE_FAILED]      = N_("Reorganize failed"),
   [GDBM_CANNOT_REPLACE]         = N_("Cannot replace"),
@@ -124,20 +124,15 @@ const char * const gdbm_errlist[_GDBM_MAX_ERRNO+1] = {
   [GDBM_ERR_FILE_MODE]          = N_("Failed to restore file mode"),
   [GDBM_NEED_RECOVERY]          = N_("Database needs recovery"),
   [GDBM_BACKUP_FAILED]          = N_("Failed to create backup copy"),
-  [GDBM_ERR_DIR_OVERFLOW]       = N_("File directory overflow")
+  [GDBM_DIR_OVERFLOW]           = N_("Bucket directory overflow")
 };
 
 const char *
 gdbm_strerror (gdbm_error error)
 {
-  if (((int)error < _GDBM_MIN_ERRNO) || ((int)error > _GDBM_MAX_ERRNO))
-    {
-      return _("Unknown error");
-    }
-  else
-    {
-      return gettext (gdbm_errlist[(int)error]);
-    }
+  if (error < _GDBM_MIN_ERRNO || error > _GDBM_MAX_ERRNO)
+    error = GDBM_UNKNOWN_ERRNO;
+  return gettext (gdbm_errlist[error]);
 }
 
 char const *
@@ -145,16 +140,7 @@ gdbm_db_strerror (GDBM_FILE dbf)
 {
   if (!dbf->last_errstr)
     {
-      char const *errstr;
-
-      if (dbf->last_error == GDBM_MALLOC_ERROR)
-	return _("Out of memory");
-      
-      if ((dbf->last_error < _GDBM_MIN_ERRNO)
-	  || (dbf->last_error > _GDBM_MAX_ERRNO))
-	errstr = _("Unknown error");
-      else
-	errstr = gettext (gdbm_errlist[dbf->last_error]);
+      char const *errstr = gdbm_strerror (dbf->last_error);
 
       if (dbf->last_syserror)
 	{