diff sample.cpp @ 370:2d5c3f8e8c22

Merge gcc-4.3-cleanups branch (-r629:642, but I consider that branch as
having served its purpose) onto the trunk.

Now compiles cleanly even with a fairly picky gcc.  I await version 4.4
with bated breath.

--- a/sample.cpp	Wed Nov 12 10:21:06 2008 +0000
+++ b/sample.cpp	Wed Nov 12 15:40:40 2008 +0000
@@ -109,11 +109,15 @@
 
     /* FIXME: this seeking, reading and distance calculation should
        share more code with the query loop */
-    lseek(dbfid, dbH->dataOffset + trackOffsetTable[track1] * sizeof(double) + i1 * dbH->dim * sizeof(double), SEEK_SET);
-    read(dbfid, v1, dbH->dim * sequenceLength * sizeof(double));
+    if(lseek(dbfid, dbH->dataOffset + trackOffsetTable[track1] * sizeof(double) + i1 * dbH->dim * sizeof(double), SEEK_SET) == (off_t) -1) {
+      error("seek failure", "", "lseek");
+    }
+    CHECKED_READ(dbfid, v1, dbH->dim * sequenceLength * sizeof(double));
 
-    lseek(dbfid, dbH->dataOffset + trackOffsetTable[track2] * sizeof(double) + i2 * dbH->dim * sizeof(double), SEEK_SET);
-    read(dbfid, v2, dbH->dim * sequenceLength * sizeof(double));
+    if(lseek(dbfid, dbH->dataOffset + trackOffsetTable[track2] * sizeof(double) + i2 * dbH->dim * sizeof(double), SEEK_SET) == (off_t) -1) {
+      error("seek failure", "", "lseek");
+    }
+    CHECKED_READ(dbfid, v2, dbH->dim * sequenceLength * sizeof(double));
 
     v1norm = 0;
     v2norm = 0;