X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fdirs.c;h=f0a5687cc16fbb47d2153755cc45258a9d53c2fd;hb=facded78072e8ebbe652a6cc94b529fad014b184;hp=ce6da3f43fecc6eeee8803e06ac3860007d132e0;hpb=83762ea76e5af65ccb4407c6b38053bc6491a875;p=idzebra-moved-to-github.git

diff --git a/index/dirs.c b/index/dirs.c
index ce6da3f..f0a5687 100644
--- a/index/dirs.c
+++ b/index/dirs.c
@@ -4,7 +4,14 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dirs.c,v $
- * Revision 1.2  1995-11-20 11:56:23  adam
+ * Revision 1.4  1995-11-30 08:34:27  adam
+ * Started work on commit facility.
+ * Changed a few malloc/free to xmalloc/xfree.
+ *
+ * Revision 1.3  1995/11/20  16:59:45  adam
+ * New update method: the 'old' keys are saved for each records.
+ *
+ * Revision 1.2  1995/11/20  11:56:23  adam
  * Work on new traversal.
  *
  * Revision 1.1  1995/11/17  15:54:42  adam
@@ -74,22 +81,14 @@ struct dirs_info *dirs_open (Dict dict, const char *rep)
     int before = 0, after;
 
     logf (LOG_DEBUG, "dirs_open %s", rep);
-    if (!(p = malloc (sizeof (*p))))
-    {
-        logf (LOG_FATAL|LOG_ERRNO, "malloc");
-        exit (1);
-    }
+    p = xmalloc (sizeof (*p));
     p->dict = dict;
     strcpy (p->prefix, rep);
     p->prelen = strlen(p->prefix);
     strcpy (p->nextpath, rep);
     p->no_read = p->no_cur = 0;
     after = p->no_max = 400;
-    if (!(p->entries = malloc (sizeof(*p->entries) * (p->no_max))))
-    {
-        logf (LOG_FATAL|LOG_ERRNO, "malloc");
-        exit (1);
-    }
+    p->entries = xmalloc (sizeof(*p->entries) * (p->no_max));
     logf (LOG_DEBUG, "dirs_open first scan");
     dict_scan (p->dict, p->nextpath, &before, &after, p, dirs_client_proc);
     return p;
@@ -97,7 +96,7 @@ struct dirs_info *dirs_open (Dict dict, const char *rep)
 
 struct dirs_entry *dirs_read (struct dirs_info *p)
 {
-    int before = 0, after = p->no_max;
+    int before = 0, after = p->no_max+1;
 
     if (p->no_read < p->no_cur)
     {
@@ -107,10 +106,6 @@ struct dirs_entry *dirs_read (struct dirs_info *p)
     }
     if (p->no_cur < p->no_max)
         return p->last_entry = NULL;
-#if 0
-    strcpy (p->nextpath, p->prefix);
-    strcat (p->nextpath, (p->entries + p->no_max-1)->path);
-#endif
     p->no_cur = -1;
     logf (LOG_DEBUG, "dirs_read rescan");
     dict_scan (p->dict, p->nextpath, &before, &after, p, dirs_client_proc);
@@ -172,8 +167,8 @@ void dirs_free (struct dirs_info **pp)
 {
     struct dirs_info *p = *pp;
 
-    free (p->entries);
-    free (p);
+    xfree (p->entries);
+    xfree (p);
     *pp = NULL;
 }