Happy new year

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

diff --git a/dfa/states.c b/dfa/states.c
index 3e4542e..17b6fa3 100644 (file)
--- a/dfa/states.c
+++ b/dfa/states.c
@@ -1,8 +1,5 @@
-/* $Id: states.c,v 1.8 2005-01-15 19:38:19 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) Index Data
 
 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
@@ -15,12 +12,15 @@ 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.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <assert.h>
 
@@ -33,12 +33,12 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #define DFA_CHUNK 40
 #define TRAN_CHUNK 100
 
-int init_DFA_states (struct DFA_states **dfasp, SetType st, int hash)
+int init_DFA_states (struct DFA_states **dfasp, DFASetType st, int hash)
 {
     struct DFA_states *dfas;
     struct DFA_trans *tm;
     int i;
-    
+
     dfas = (struct DFA_states *) imalloc (sizeof(struct DFA_states));
     assert (dfas);
     dfas->hasharray = (struct DFA_state **)
@@ -95,7 +95,7 @@ int rm_DFA_states (struct DFA_states **dfasp)
     return 0;
 }
 
-int add_DFA_state (struct DFA_states *dfas, Set *s, struct DFA_state **sp)
+int add_DFA_state (struct DFA_states *dfas, DFASet *s, struct DFA_state **sp)
 {
     int i;
     struct DFA_state *si, **sip;
@@ -104,12 +104,12 @@ int add_DFA_state (struct DFA_states *dfas, Set *s, struct DFA_state **sp)
     assert (dfas);
     assert (*s);
     assert (dfas->hasharray);
-    sip = dfas->hasharray + (hash_Set (dfas->st, *s) % dfas->hash);
+    sip = dfas->hasharray + (hash_DFASet (dfas->st, *s) % dfas->hash);
     for (si = *sip; si; si=si->link)
-        if (eq_Set (dfas->st, si->set, *s))
+        if (eq_DFASet (dfas->st, si->set, *s))
         {
             *sp = si;
-            *s = rm_Set (dfas->st, *s);
+            *s = rm_DFASet (dfas->st, *s);
             return 0;
         }
     if (!dfas->freelist)
@@ -117,7 +117,7 @@ int add_DFA_state (struct DFA_states *dfas, Set *s, struct DFA_state **sp)
         sb = (DFA_stateb *) imalloc (sizeof(*sb));
         sb->next = dfas->statemem;
         dfas->statemem = sb;
-        sb->state_block = si = dfas->freelist = 
+        sb->state_block = si = dfas->freelist =
             (struct DFA_state *) imalloc (sizeof(struct DFA_state)*DFA_CHUNK);
         for (i = 0; i<DFA_CHUNK-1; i++, si++)
             si->next = si+1;
@@ -196,3 +196,12 @@ void sort_DFA_states (struct DFA_states *dfas)
     ifree (dfas->hasharray);
     dfas->hasharray = NULL;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+