X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dfa%2Fbset.c;h=6ca49e43ce5a8da48e596db2e8a945c380207638;hp=1d1634686eaeb778174c9bb71c279d4b27fca33b;hb=aeea139423b8eaf28a4de53b3d7b2ad1f22284e7;hpb=89d3a004b7c651fd5673abfc192e1472dc4d4197

diff --git a/dfa/bset.c b/dfa/bset.c
index 1d16346..6ca49e4 100644
--- a/dfa/bset.c
+++ b/dfa/bset.c
@@ -1,8 +1,5 @@
-/* $Id: bset.c,v 1.11 2007-01-15 15:10:15 adam Exp $
-   Copyright (C) 1995-2007
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 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
@@ -21,6 +18,9 @@ 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>
 
@@ -31,17 +31,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <bset.h>
 #include "imalloc.h"
 
-#define GET_BIT(s,m) (s[(m)/(sizeof(BSetWord)*8)]&(1<<(m&(sizeof(BSetWord)*8-1)))) 
+#define GET_BIT(s,m) (s[(m)/(sizeof(BSetWord)*8)]&(1<<(m&(sizeof(BSetWord)*8-1))))
 #define SET_BIT(s,m) (s[(m)/(sizeof(BSetWord)*8)]|=(1<<(m&(sizeof(BSetWord)*8-1))))
 
 BSetHandle *mk_BSetHandle (int size, int chunk)
 {
-    int wsize = 1+size/(sizeof(BSetWord)*8);    
+    int wsize = 1+size/(sizeof(BSetWord)*8);
     BSetHandle *sh;
 
     if (chunk <= 1)
         chunk = 32;
-    sh = (BSetHandle *) imalloc (sizeof(BSetHandle) + 
+    sh = (BSetHandle *) imalloc (sizeof(BSetHandle) +
                                 chunk*sizeof(BSetWord)*wsize);
 
     sh->size = size;
@@ -94,7 +94,7 @@ BSet mk_BSet (BSetHandle **shp)
     off = sh->offset;
     if ((off + sh->wsize) > sh->chunk)
     {
-        sh1 = (BSetHandle *) imalloc (sizeof(BSetHandle) + 
+        sh1 = (BSetHandle *) imalloc (sizeof(BSetHandle) +
                                      sh->chunk*sizeof(BSetWord));
         sh1->size = sh->size;
         sh1->wsize = sh->wsize;
@@ -261,8 +261,9 @@ void pr_charBSet (BSetHandle *sh, BSet src, void (*f) (int))
         i1 = trav_BSet (sh, src, ++i);
         if (i1 == i)
         {
-            while ((i1=trav_BSet (sh, src, ++i)) == i)
-                ;
+            do
+                ++i;
+            while ((i1=trav_BSet (sh, src, i)) == i);
             if (i != i0+2)
                 f ('-');
             if (i-1 == '-')
@@ -277,6 +278,7 @@ void pr_charBSet (BSetHandle *sh, BSet src, void (*f) (int))
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab