← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/unireg.cc

  • 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:
drizzled/unireg.cc
220
220
  key_buff_length= uint4korr(fileinfo+47);
221
221
  keybuff=(uchar*) my_malloc(key_buff_length, MYF(0));
222
222
  key_info_length= pack_keys(keybuff, keys, key_info, data_offset);
223
 
  VOID(get_form_pos(file,fileinfo,&formnames));
 
223
  get_form_pos(file,fileinfo,&formnames);
224
224
  if (!(filepos=make_new_entry(file,fileinfo,&formnames,"")))
225
225
    goto err;
226
226
  maxlength=(uint) next_io_size((ulong) (uint2korr(forminfo)+1000));
236
236
  if (pwrite(file, fileinfo, 64, 0L) == 0 ||
237
237
      pwrite(file, keybuff, key_info_length, (ulong) uint2korr(fileinfo+6)) == 0)
238
238
    goto err;
239
 
  VOID(my_seek(file,
 
239
  my_seek(file,
240
240
               (ulong) uint2korr(fileinfo+6)+ (ulong) key_buff_length,
241
 
               MY_SEEK_SET,MYF(0)));
 
241
               MY_SEEK_SET,MYF(0));
242
242
  if (make_empty_rec(thd,file,ha_legacy_type(create_info->db_type),
243
243
                     create_info->table_options,
244
244
                     create_fields,reclength, data_offset, db_file))
305
305
      }
306
306
    }
307
307
  }
308
 
  VOID(my_seek(file,filepos,MY_SEEK_SET,MYF(0)));
 
308
  my_seek(file,filepos,MY_SEEK_SET,MYF(0));
309
309
  if (my_write(file, forminfo, 288, MYF_RW) ||
310
310
      my_write(file, screen_buff, info_length, MYF_RW) ||
311
311
      pack_fields(file, create_fields, data_offset))
344
344
  my_free(screen_buff, MYF(0));
345
345
  my_free(keybuff, MYF(0));
346
346
err2:
347
 
  VOID(my_close(file,MYF(MY_WME)));
 
347
  my_close(file,MYF(MY_WME));
348
348
err3:
349
349
  my_delete(file_name,MYF(0));
350
350
  return(1);
398
398
  return(0);
399
399
 
400
400
err_handler:
401
 
  VOID(file->ha_create_handler_files(path, NULL, CHF_DELETE_FLAG, create_info));
 
401
  file->ha_create_handler_files(path, NULL, CHF_DELETE_FLAG, create_info);
402
402
  my_delete(frm_name, MYF(0));
403
403
  return(1);
404
404
} /* rea_create_table */