← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_dynrec.c

  • Committer: Monty Taylor
  • Date: 2008-09-23 14:19:48 UTC
  • mto: This revision was merged to the branch mainline in revision 419.
  • Revision ID: monty@inaugust.com-20080923141948-ktph2kg13addaxq1
Actually removed VOID() this time.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_dynrec.c
108
108
{
109
109
  if (info->s->file_map)
110
110
  {
111
 
    VOID(my_munmap((char*) info->s->file_map,
112
 
                   (size_t) info->s->mmaped_length + MEMMAP_EXTRA_MARGIN));
 
111
    my_munmap((char*) info->s->file_map,
 
112
              (size_t) info->s->mmaped_length + MEMMAP_EXTRA_MARGIN);
113
113
    mi_dynmap_file(info, size);
114
114
  }
115
115
}
1487
1487
panic:
1488
1488
  my_errno=HA_ERR_WRONG_IN_RECORD;
1489
1489
err:
1490
 
  VOID(_mi_writeinfo(info,0));
 
1490
  _mi_writeinfo(info,0);
1491
1491
  return(-1);
1492
1492
}
1493
1493
 
1787
1787
            block_info.filepos + block_info.data_len &&
1788
1788
            flush_io_cache(&info->rec_cache))
1789
1789
          goto err;
1790
 
        /* VOID(my_seek(info->dfile,filepos,MY_SEEK_SET,MYF(0))); */
 
1790
        /* my_seek(info->dfile,filepos,MY_SEEK_SET,MYF(0)); */
1791
1791
        if (my_read(info->dfile,(uchar*) to,block_info.data_len,MYF(MY_NABP)))
1792
1792
        {
1793
1793
          if (my_errno == -1)
1821
1821
  my_errno=HA_ERR_WRONG_IN_RECORD;              /* Something is fatal wrong */
1822
1822
err:
1823
1823
  save_errno=my_errno;
1824
 
  VOID(_mi_writeinfo(info,0));
 
1824
  _mi_writeinfo(info,0);
1825
1825
  return(my_errno=save_errno);
1826
1826
}
1827
1827
 
1840
1840
      pointer set to the end of the header after this function.
1841
1841
      my_pread() may leave the file pointer untouched.
1842
1842
    */
1843
 
    VOID(my_seek(file,filepos,MY_SEEK_SET,MYF(0)));
 
1843
    my_seek(file,filepos,MY_SEEK_SET,MYF(0));
1844
1844
    if (my_read(file, header, sizeof(info->header),MYF(0)) !=
1845
1845
        sizeof(info->header))
1846
1846
      goto err;