← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_open.c

Removing deprecated functions from code and replacing them with C99 equivalents:
- replacing bcmp() calls with memcmp() calls
- replacing bfill() with memset()
- replacing bmove() and bcopy() with memcpy() or memmove()

The function memcpy_fixed() was apparantly introduced to fix a problem in gcc on
Alpha, but since it is not used consistently, it is likely not necessary any more.
It was replaced with memcpy().

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_open.c
727
727
  uint  i, keys= (uint) state->header.keys,
728
728
        key_blocks=state->header.max_block_size_index;
729
729
 
730
 
  memcpy_fixed(ptr,&state->header,sizeof(state->header));
 
730
  memcpy(ptr,&state->header,sizeof(state->header));
731
731
  ptr+=sizeof(state->header);
732
732
 
733
733
  /* open_count must be first because of _mi_mark_file_changed ! */
786
786
uchar *mi_state_info_read(uchar *ptr, MI_STATE_INFO *state)
787
787
{
788
788
  uint i,keys,key_parts,key_blocks;
789
 
  memcpy_fixed(&state->header,ptr, sizeof(state->header));
 
789
  memcpy(&state->header,ptr, sizeof(state->header));
790
790
  ptr +=sizeof(state->header);
791
791
  keys=(uint) state->header.keys;
792
792
  key_parts=mi_uint2korr(state->header.key_parts);