6 files changed, 7 insertions, 7 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 0d2ca53..2710bf0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,7 +33,7 @@ BUILT_SOURCES = gdbm.h gram.h
 gram.h: gram.c
 
 # The libraries
-VI_CURRENT  = 5
+VI_CURRENT  = 6
 VI_REVISION = 0
 VI_AGE      = 0
 
diff --git a/src/bucket.c b/src/bucket.c
index a3e8f4e..4b69bbe 100644
--- a/src/bucket.c
+++ b/src/bucket.c
@@ -29,7 +29,7 @@ void
 _gdbm_new_bucket (GDBM_FILE dbf, hash_bucket *bucket, int bits)
 {
   int index;
-  
+
   /* Initialize the avail block. */
   bucket->av_count = 0;
 
@@ -146,7 +146,7 @@ _gdbm_get_bucket (GDBM_FILE dbf, int dir_index)
       if (!(bucket->count >= 0
             && bucket->count <= dbf->header->bucket_elems
             && bucket->bucket_bits >= 0
-            && bucket->bucket_bits <= GDBM_HASH_BITS))
+            && bucket->bucket_bits <= dbf->header->dir_bits))
         {
           GDBM_SET_ERRNO (dbf, GDBM_BAD_BUCKET, TRUE);
           return -1;
diff --git a/src/falloc.c b/src/falloc.c
index 2f21ebe..6571d9b 100644
--- a/src/falloc.c
+++ b/src/falloc.c
@@ -292,7 +292,7 @@ push_avail_block (GDBM_FILE dbf)
   av_adr = new_loc.av_adr;
 
   /* Split the header block. */
-  temp = malloc (av_size);
+  temp = calloc (1, av_size);
   if (temp == NULL)
     {
       GDBM_SET_ERRNO (dbf, GDBM_MALLOC_ERROR, TRUE);
diff --git a/src/gdbmopen.c b/src/gdbmopen.c
index 03cc4f4..677f1cf 100644
--- a/src/gdbmopen.c
+++ b/src/gdbmopen.c
@@ -154,7 +154,7 @@ validate_header (gdbm_file_header const *hdr, struct stat const *st)
   if (hdr->dir_bits != dir_bits)
     return GDBM_BAD_HEADER;
   
-  if (!(hdr->bucket_size > 0 && hdr->bucket_size > sizeof(hash_bucket)))
+  if (!(hdr->bucket_size > sizeof(hash_bucket)))
     return GDBM_BAD_HEADER;
 
   if (hdr->bucket_elems != bucket_element_count (hdr->bucket_size))
diff --git a/src/gdbmsetopt.c b/src/gdbmsetopt.c
index f9face0..865f5a5 100644
--- a/src/gdbmsetopt.c
+++ b/src/gdbmsetopt.c
@@ -54,13 +54,13 @@ setopt_gdbm_setcachesize (GDBM_FILE dbf, void *optval, int optlen)
 {
   size_t sz;
 
-  /* Optval will point to the new size of the cache. */
   if (dbf->bucket_cache != NULL)
     {
       GDBM_SET_ERRNO (dbf, GDBM_OPT_ALREADY_SET, FALSE);
       return -1;
     }
   
+  /* Optval will point to the new size of the cache. */
   if (get_size (optval, optlen, &sz))
     {     
       GDBM_SET_ERRNO (dbf, GDBM_OPT_ILLEGAL, FALSE);
diff --git a/src/gdbmtool.c b/src/gdbmtool.c
index 6d56578..d0b2694 100644
--- a/src/gdbmtool.c
+++ b/src/gdbmtool.c
@@ -919,7 +919,7 @@ list_handler (struct handler_param *param)
       data = gdbm_fetch (gdbm_file, key);
       if (!data.dptr)
          {
-           terror (_("cannot fetch data; the key was:"));
+           terror (_("%s; the key was:"), gdbm_db_strerror (gdbm_file));
            datum_format (stderr, &key, dsdef[DS_KEY]);
          }
       else