Word type 0 is reserved.

[libucw.git] / lib / db.c

diff --git a/lib/db.c b/lib/db.c
index fd8a8c0e25b4808f2162173c817531fb43c24e3f..de48171f58ba6d6bca523c5c3319789657880885 100644 (file)
--- a/lib/db.c
+++ b/lib/db.c
@@ -1,7 +1,7 @@
 /*
  *     Sherlock Library -- Fast Database Management Routines
  *
 /*
  *     Sherlock Library -- Fast Database Management Routines
  *

- *     (c) 1999--2000 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+ *     (c) 1999--2000 Martin Mares <mj@ucw.cz>

  */
 
 /*
  */
 
 /*


@@ -19,18 +19,18 @@
  *     and we assume it's sorted.
  */
 
  *     and we assume it's sorted.
  */
 

+#include "lib/lib.h"
+#include "lib/lfs.h"
+#include "lib/pagecache.h"
+#include "lib/db.h"
+#include "lib/db_internal.h"
+

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
 

-#include "lib.h"
-#include "lfs.h"
-#include "pagecache.h"
-#include "db.h"
-#include "db_internal.h"
-

 struct sdbm *
 sdbm_open(struct sdbm_options *o)
 {
 struct sdbm *
 sdbm_open(struct sdbm_options *o)
 {


@@ -38,8 +38,7 @@ sdbm_open(struct sdbm_options *o)
   struct sdbm_root root, *r;
   uns cache_size = o->cache_size ? o->cache_size : 16;
 
   struct sdbm_root root, *r;
   uns cache_size = o->cache_size ? o->cache_size : 16;
 

-  d = xmalloc(sizeof(struct sdbm));
-  bzero(d, sizeof(*d));
+  d = xmalloc_zero(sizeof(struct sdbm));

   d->flags = o->flags;
   d->fd = sh_open(o->name, ((d->flags & SDBM_WRITE) ? O_RDWR : O_RDONLY), 0666);
   if (d->fd >= 0)                      /* Already exists, let's check it */
   d->flags = o->flags;
   d->fd = sh_open(o->name, ((d->flags & SDBM_WRITE) ? O_RDWR : O_RDONLY), 0666);
   if (d->fd >= 0)                      /* Already exists, let's check it */


@@ -102,7 +101,7 @@ sdbm_close(struct sdbm *d)
     pgc_close(d->cache);
   if (d->fd >= 0)
     close(d->fd);
     pgc_close(d->cache);
   if (d->fd >= 0)
     close(d->fd);

-  free(d);
+  xfree(d);

 }
 
 static uns
 }
 
 static uns