X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isamc%2Fmerge.c;h=e0b7fce8e07602125d8bb00ce7f42f0350572f7b;hb=ef696645cc3b7e0f4027008d1dc589c0f0f90c1f;hp=b0d4315de57b08255deb99073e70c1e84bbed2ba;hpb=c0826c3b142ac40494080a5c45c42abbd8ffc3f8;p=idzebra-moved-to-github.git

diff --git a/isamc/merge.c b/isamc/merge.c
index b0d4315..e0b7fce 100644
--- a/isamc/merge.c
+++ b/isamc/merge.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: merge.c,v $
- * Revision 1.9  1998-03-19 10:04:38  adam
+ * Revision 1.11  1999-05-26 07:49:14  adam
+ * C++ compilation.
+ *
+ * Revision 1.10  1998/03/19 12:22:09  adam
+ * Minor change.
+ *
+ * Revision 1.9  1998/03/19 10:04:38  adam
  * Minor changes.
  *
  * Revision 1.8  1998/03/18 09:23:55  adam
@@ -55,7 +61,8 @@ struct isc_merge_block {
     int dirty;        /* block is different from that on file */
 };
 
-static void opt_blocks (ISAMC is, struct isc_merge_block *mb, int ptr, int last)
+static void opt_blocks (ISAMC is, struct isc_merge_block *mb, int ptr,
+			int last)
 {
     int i, no_dirty = 0;
     for (i = 0; i<ptr; i++)
@@ -107,7 +114,7 @@ static void flush_blocks (ISAMC is, struct isc_merge_block *mb, int ptr,
             mb[i].dirty = 1;
         }
     }
-    opt_blocks (is, mb, ptr, last);
+
     for (i = 0; i<ptr; i++)
     {
         char *src;