X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gnushogi%2Fbook.c;h=57758bbd5c7083bd6bfd49fc2269d37289b0e785;hb=41518afff9fc23dadca228ff069814e134af303e;hp=6df98e6988866aca0b0f8daa1664d9ad3d48cdf5;hpb=31a87931cd4644f17e21114612ae2f348660bac1;p=gnushogi.git

diff --git a/gnushogi/book.c b/gnushogi/book.c
index 6df98e6..57758bb 100644
--- a/gnushogi/book.c
+++ b/gnushogi/book.c
@@ -576,24 +576,23 @@ static ULONG currentoffset;
 
 #define MAXOFFSET(B) ((B.booksize - 1) * sizeof_gdxdata + sizeof_gdxadmin)
 
-#define HashOffset(hashkey, B) \
-{ \
-  currentoffset = ((ULONG)hashkey % B.booksize) \
-    * sizeof_gdxdata + sizeof_gdxadmin; \
+static void HashOffset(ULONG hashkey, struct gdxadmin *B)
+{
+    currentoffset = (hashkey % B->booksize) * sizeof_gdxdata + sizeof_gdxadmin;
 }
 
 
-#define NextOffset(B) \
-{ \
-  currentoffset += sizeof_gdxdata; \
-  if (currentoffset > B.maxoffset) \
-    currentoffset = sizeof_gdxadmin; \
+static void NextOffset(struct gdxadmin *B)
+{
+    currentoffset += sizeof_gdxdata;
+    if (currentoffset > B->maxoffset)
+        currentoffset = sizeof_gdxadmin;
 }
 
 
 #define WriteAdmin() \
 { \
-  lseek(gfd, 0, 0); \
+  lseek(gfd, 0, SEEK_SET); \
   write(gfd, (char *)&ADMIN, sizeof_gdxadmin); \
 }
 
@@ -601,7 +600,7 @@ static ULONG currentoffset;
 { \
   if (mustwrite ) \
   { \
-    lseek(gfd, currentoffset, 0); \
+    lseek(gfd, currentoffset, SEEK_SET); \
     write(gfd, (char *)&DATA, sizeof_gdxdata); \
     mustwrite = false; \
   } \
@@ -609,13 +608,13 @@ static ULONG currentoffset;
 
 static int ReadAdmin(void)
 {
-    lseek(gfd, 0, 0);
+    lseek(gfd, 0, SEEK_SET);
     return (sizeof_gdxadmin == read(gfd, (char *)&ADMIN, sizeof_gdxadmin));
 }
 
 static int ReadData(struct gdxdata *DATA)
 {
-    lseek(gfd, currentoffset, 0);
+    lseek(gfd, currentoffset, SEEK_SET);
     return (sizeof_gdxdata == read(gfd, (char *)DATA, sizeof_gdxdata));
 }
 
@@ -737,7 +736,7 @@ GetOpenings(void)
                              */
 
                             WriteData();
-                            HashOffset(bhashkey, B);
+                            HashOffset(bhashkey, &B);
                             first = true;
 
                             while (true)
@@ -779,7 +778,7 @@ GetOpenings(void)
                                     }
                                 }
 
-                                NextOffset(B);
+                                NextOffset(&B);
                                 first = false;
                             }
 
@@ -923,7 +922,7 @@ OpeningBook(unsigned short *hint)
         }
 
         x = 0;
-        HashOffset(hashkey, B);
+        HashOffset(hashkey, &B);
 #ifdef BOOKTEST
         printf("looking for book move, bhashbd = 0x%lx bhashkey = 0x%x\n",
                (ULONG)hashbd, HashValue(hashkey));
@@ -949,7 +948,7 @@ OpeningBook(unsigned short *hint)
                     break;
             }
 
-            NextOffset(B);
+            NextOffset(&B);
         }
 
 #ifdef BOOKTEST