--- a/src/database.c	Mon Aug 13 09:00:04 2007 +0200
+++ b/src/database.c	Mon Aug 13 09:02:59 2007 +0200
@@ -71,7 +71,7 @@
   XEMACS_DB_TYPE type;
   int mode;
   int ackcess;
-  int dberrno;
+  int errno;
   void *db_handle;
   DB_FUNCS *funcs;
 };
@@ -100,7 +100,7 @@
   dbase->db_handle = NULL;
   dbase->ackcess = 0;
   dbase->mode = 0;
-  dbase->dberrno = 0;
+  dbase->errno = 0;
   dbase->type = DB_UNKNOWN;
   return (dbase);
 }
@@ -322,7 +322,7 @@
 static Lisp_Object
 dbm_lasterr (struct database_struct *dbp)
 {
-  char *temp = strerror (dbp->dberrno);
+  char *temp = strerror (dbp->errno);
   return (make_string ((unsigned char *) temp, strlen (temp)));
 }
 
@@ -405,7 +405,7 @@
 static Lisp_Object
 berkdb_lasterr (struct database_struct *dbp)
 {
-  char *temp = strerror (dbp->dberrno);
+  char *temp = strerror (dbp->errno);
   return (make_string ((unsigned char *) temp, strlen (temp)));
 }
 
@@ -424,7 +424,7 @@
   if (!status)
     return (make_string (valdatum.data, valdatum.size));
 
-  db->dberrno = (status == 1) ? -1 : errno;
+  db->errno = (status == 1) ? -1 : errno;
   return (Qnil);
 }
 
@@ -444,7 +444,7 @@
   valdatum.size = XSTRING_LENGTH (val);
   status = dbp->put (dbp, &keydatum, &valdatum, NILP (replace)
 		     ? R_NOOVERWRITE : 0);
-  db->dberrno = (status == 1) ? -1 : errno;
+  db->errno = (status == 1) ? -1 : errno;
   return status;
 }
 
@@ -462,7 +462,7 @@
   if (!status)
     return 0;
   
-  db->dberrno = (status == 1) ? -1 : errno;
+  db->errno = (status == 1) ? -1 : errno;
   return 1;
 }
 
@@ -543,10 +543,8 @@
   DB_FUNCS *funcblock;
   struct database_struct *dbase = NULL;
   void *db = NULL;
-  struct gcpro gcpro1;
 
-  GCPRO1 (file);
-  file = Fexpand_file_name (file, Qnil);
+  CHECK_STRING (file);
 
   if (NILP (ackcess))
     {
@@ -625,8 +623,6 @@
   dbase->funcs = funcblock;
   XSETDATABASE (retval, dbase);
 
-  UNGCPRO;
-
   return (retval);
 }