C++ compilation.

[idzebra-moved-to-github.git] / dfa / set.c

diff --git a/dfa/set.c b/dfa/set.c
index 274b57c..aaf9313 100644 (file)
--- a/dfa/set.c
+++ b/dfa/set.c
@@ -1,10 +1,25 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: set.c,v $
- * Revision 1.2  1995-01-24 16:00:22  adam
+ * Revision 1.7  1999-05-26 07:49:12  adam
+ * C++ compilation.
+ *
+ * Revision 1.6  1999/02/02 14:50:13  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.5  1996/10/29 13:57:29  adam
+ * Include of zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.4  1995/09/04 12:33:27  adam
+ * Various cleanup. YAZ util used instead.
+ *
+ * Revision 1.3  1995/02/06  10:12:55  adam
+ * Unused static function rm_SetElement was removed.
+ *
+ * Revision 1.2  1995/01/24  16:00:22  adam
  * Added -ansi to CFLAGS.
  * Some changes to the dfa module.
  *
@@ -19,12 +34,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <util.h>
 #include <set.h>
 #include "imalloc.h"
 
 
-static void rm_SetElement (SetType st, SetElement *p);
 static Set mk_SetElement (SetType st, int n);
 
 SetType mk_SetType (int chunk)
@@ -96,6 +109,7 @@ static Set mk_SetElement (SetType st, int n)
     return s;
 }
 
+#if 0
 static void rm_SetElement (SetType st, SetElement *p)
 {
     assert (st);
@@ -104,6 +118,7 @@ static void rm_SetElement (SetType st, SetElement *p)
     st->freelist = p;
     st->used--;
 }
+#endif
 
 Set rm_Set (SetType st, Set s)
 {
@@ -128,16 +143,16 @@ Set rm_Set (SetType st, Set s)
 Set add_Set (SetType st, Set s, int n)
 {
     SetElement dummy;
-    Set p = &dummy, new;
+    Set p = &dummy, snew;
     p->next = s;
     while (p->next && p->next->value < n)
         p = p->next;
     assert (p);
     if (!(p->next && p->next->value == n))
     {
-        new = mk_SetElement (st, n);
-        new->next = p->next;
-        p->next = new;
+        snew = mk_SetElement (st, n);
+        snew->next = p->next;
+        p->next = snew;
     }
     return dummy.next;
 }