Moved isam headers to include/idzebra.

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

diff --git a/dfa/set.c b/dfa/set.c
index 274b57c..5a2aa99 100644 (file)
--- a/dfa/set.c
+++ b/dfa/set.c
@@ -1,30 +1,36 @@
-/*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: set.c,v $
- * Revision 1.2  1995-01-24 16:00:22  adam
- * Added -ansi to CFLAGS.
- * Some changes to the dfa module.
- *
- * Revision 1.1  1994/09/26  10:16:57  adam
- * First version of dfa module in alex. This version uses yacc to parse
- * regular expressions. This should be hand-made instead.
- *
- */
+/* $Id: set.c,v 1.8 2002-08-02 19:26:55 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
 #include <stdio.h>
 #include <assert.h>
 
 #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 +102,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 +111,7 @@ static void rm_SetElement (SetType st, SetElement *p)
     st->freelist = p;
     st->used--;
 }
+#endif
 
 Set rm_Set (SetType st, Set s)
 {
@@ -128,16 +136,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;
 }