← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_open.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_open.c
150
150
    end_pos=disk_cache+info_length;
151
151
    errpos=2;
152
152
 
153
 
    VOID(my_seek(kfile,0L,MY_SEEK_SET,MYF(0)));
 
153
    my_seek(kfile,0L,MY_SEEK_SET,MYF(0));
154
154
    errpos=3;
155
155
    if (my_read(kfile,disk_cache,info_length,MYF(MY_NABP)))
156
156
    {
382
382
    mi_setup_functions(share);
383
383
    share->is_log_table= false;
384
384
    thr_lock_init(&share->lock);
385
 
    VOID(pthread_mutex_init(&share->intern_lock,MY_MUTEX_INIT_FAST));
 
385
    pthread_mutex_init(&share->intern_lock,MY_MUTEX_INIT_FAST);
386
386
    for (i=0; i<keys; i++)
387
 
      VOID(my_rwlock_init(&share->key_root_lock[i], NULL));
388
 
    VOID(my_rwlock_init(&share->mmap_lock, NULL));
 
387
      my_rwlock_init(&share->key_root_lock[i], NULL);
 
388
    my_rwlock_init(&share->mmap_lock, NULL);
389
389
    if (!thr_lock_inited)
390
390
    {
391
391
      /* Probably a single threaded program; Don't use concurrent inserts */
520
520
    my_free((uchar*) m_info,MYF(0));
521
521
    /* fall through */
522
522
  case 5:
523
 
    VOID(my_close(info.dfile,MYF(0)));
 
523
    my_close(info.dfile,MYF(0));
524
524
    if (old_info)
525
525
      break;                                    /* Don't remove open table */
526
526
    /* fall through */
533
533
    my_afree(disk_cache);
534
534
    /* fall through */
535
535
  case 1:
536
 
    VOID(my_close(kfile,MYF(0)));
 
536
    my_close(kfile,MYF(0));
537
537
    /* fall through */
538
538
  case 0:
539
539
  default: