comparison insert.cpp @ 596:6ad0a6e67d4c

Take advantage of those new handy _or_goto_error macros

Use them in various places where previously we either elided the error
checking (various lseek() calls) or used a combination of calls
(replaced by malloc_and_fill_or_goto_error()).

In the process, fix what is probably a bug (or else introduce one, but I
don't think so): audiodb_track_id_datum() computed the offset into the
timesTable wrongly, forgetting to multiply by 2.  (TODO: this should be
easily testable using the API).

Now all of LIBOBJS can be produced by my (Debian's) mingw32
cross-compiler, except for lshlib.o.

    */
   offset = adb->header->length;
   nfiles = adb->header->numFiles;
 
   /* FIXME: checking for all these lseek()s */
-  lseek(adb->fd, adb->header->fileTableOffset + nfiles * ADB_FILETABLE_ENTRY_SIZE, SEEK_SET);
+  lseek_set_or_goto_error(adb->fd, adb->header->fileTableOffset + nfiles * ADB_FILETABLE_ENTRY_SIZE);
   write_or_goto_error(adb->fd, datum->key, strlen(datum->key)+1);
-  lseek(adb->fd, adb->header->trackTableOffset + nfiles * ADB_TRACKTABLE_ENTRY_SIZE, SEEK_SET);
+  lseek_set_or_goto_error(adb->fd, adb->header->trackTableOffset + nfiles * ADB_TRACKTABLE_ENTRY_SIZE);
   write_or_goto_error(adb->fd, &datum->nvectors, ADB_TRACKTABLE_ENTRY_SIZE);
   if(adb->header->flags & ADB_HEADER_FLAG_REFERENCES) {
     char cwd[PATH_MAX];
     char slash = '/';
 
     if(!getcwd(cwd, PATH_MAX)) {
       goto error;
     }
-    lseek(adb->fd, adb->header->dataOffset + nfiles * ADB_FILETABLE_ENTRY_SIZE, SEEK_SET);
+    lseek_set_or_goto_error(adb->fd, adb->header->dataOffset + nfiles * ADB_FILETABLE_ENTRY_SIZE);
     if(*((char *) datum->data) != '/') {
       write_or_goto_error(adb->fd, cwd, strlen(cwd));
       write_or_goto_error(adb->fd, &slash, 1);
     }
     write_or_goto_error(adb->fd, datum->data, strlen((const char *) datum->data)+1);
     if(datum->power) {
-      lseek(adb->fd, adb->header->powerTableOffset + nfiles * ADB_FILETABLE_ENTRY_SIZE, SEEK_SET);
+      lseek_set_or_goto_error(adb->fd, adb->header->powerTableOffset + nfiles * ADB_FILETABLE_ENTRY_SIZE);
       if(*((char *) datum->power) != '/') {
         write_or_goto_error(adb->fd, cwd, strlen(cwd));
         write_or_goto_error(adb->fd, &slash, 1);
       }
       write_or_goto_error(adb->fd, datum->power, strlen((const char *) datum->power)+1);
     }
     if(datum->times) {
-      lseek(adb->fd, adb->header->timesTableOffset + nfiles * ADB_FILETABLE_ENTRY_SIZE, SEEK_SET);
+      lseek_set_or_goto_error(adb->fd, adb->header->timesTableOffset + nfiles * ADB_FILETABLE_ENTRY_SIZE);
       if(*((char *) datum->times) != '/') {
         write_or_goto_error(adb->fd, cwd, strlen(cwd));
         write_or_goto_error(adb->fd, &slash, 1);
       }
       write_or_goto_error(adb->fd, datum->times, strlen((const char *) datum->times)+1);
     }
   } else {
-    lseek(adb->fd, adb->header->dataOffset + offset, SEEK_SET);
+    lseek_set_or_goto_error(adb->fd, adb->header->dataOffset + offset);
     write_or_goto_error(adb->fd, datum->data, sizeof(double) * datum->nvectors * datum->dim);
     if(datum->power) {
-      lseek(adb->fd, adb->header->powerTableOffset + offset / datum->dim, SEEK_SET);
+      lseek_set_or_goto_error(adb->fd, adb->header->powerTableOffset + offset / datum->dim);
       write_or_goto_error(adb->fd, datum->power, sizeof(double) * datum->nvectors);
     }
     if(datum->times) {
-      lseek(adb->fd, adb->header->timesTableOffset + offset / datum->dim * 2, SEEK_SET);
+      lseek_set_or_goto_error(adb->fd, adb->header->timesTableOffset + offset / datum->dim * 2);
       write_or_goto_error(adb->fd, datum->times, sizeof(double) * datum->nvectors * 2);
     }
   }
 
   /* 7. if ADB_HEADER_FLAG_L2NORM and !ADB_HEADER_FLAG_REFERENCES,

   if((adb->header->flags & ADB_HEADER_FLAG_L2NORM) &&
      !(adb->header->flags & ADB_HEADER_FLAG_REFERENCES)) {
     l2norm_buffer = (double *) malloc(datum->nvectors * sizeof(double));
     
     audiodb_l2norm_buffer((double *) datum->data, datum->dim, datum->nvectors, l2norm_buffer);
-    lseek(adb->fd, adb->header->l2normTableOffset + offset / datum->dim, SEEK_SET);
+    lseek_set_or_goto_error(adb->fd, adb->header->l2normTableOffset + offset / datum->dim);
     write_or_goto_error(adb->fd, l2norm_buffer, sizeof(double) * datum->nvectors);
     free(l2norm_buffer);
     l2norm_buffer = NULL;
   }
 

 
   /* 9. sync adb->header with disk. */
   return audiodb_sync_header(adb);
 
  error:
-  if(l2norm_buffer) {
-    free(l2norm_buffer);
-  }
+  maybe_free(l2norm_buffer);
   return 1;
 }
 
 int audiodb_insert_datum(adb_t *adb, const adb_datum_t *datum) {
   if(adb->header->flags & ADB_HEADER_FLAG_REFERENCES) {