← Back to branch summary

~jaypipes/drizzle/item-class-file-reorg

« back to all changes in this revision

Viewing changes to storage/myisam/mi_open.c

  • Committer: Brian Aker
  • Date: 2008-07-29 07:47:38 UTC
  • mfrom: (212.6.1 bzero-memset)
  • Revision ID: brian@tangent.org-20080729074738-lfzim6htapm42f2o
Merge from Mats

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_open.c
77
77
  lock_error=1;
78
78
  errpos=0;
79
79
  head_length=sizeof(share_buff.state.header);
80
 
  bzero((uchar*) &info,sizeof(info));
 
80
  memset((uchar*) &info, 0, sizeof(info));
81
81
 
82
82
  my_realpath(name_buff, fn_format(org_name,name,"",MI_NAME_IEXT,
83
83
                                   MY_UNPACK_FILENAME),MYF(0));
85
85
  if (!(old_info=test_if_reopen(name_buff)))
86
86
  {
87
87
    share= &share_buff;
88
 
    bzero((uchar*) &share_buff,sizeof(share_buff));
 
88
    memset((uchar*) &share_buff, 0, sizeof(share_buff));
89
89
    share_buff.state.rec_per_key_part=rec_per_key_part;
90
90
    share_buff.state.key_root=key_root;
91
91
    share_buff.state.key_del=key_del;
507
507
 
508
508
  /* Allocate buffer for one record */
509
509
 
510
 
  /* prerequisites: bzero(info) && info->s=share; are met. */
 
510
  /* prerequisites: memset(info, 0) && info->s=share; are met. */
511
511
  if (!mi_alloc_rec_buff(&info, -1, &info.rec_buff))
512
512
    goto err;
513
 
  bzero(info.rec_buff, mi_get_rec_buff_len(&info, info.rec_buff));
 
513
  memset(info.rec_buff, 0, mi_get_rec_buff_len(&info, info.rec_buff));
514
514
 
515
515
  *m_info=info;
516
516
  thr_lock_data_init(&share->lock,&m_info->lock,(void*) m_info);
889
889
  *ptr++= base->raid_type;
890
890
  mi_int2store(ptr,base->raid_chunks);                  ptr +=2;
891
891
  mi_int4store(ptr,base->raid_chunksize);               ptr +=4;
892
 
  bzero(ptr,6);                                         ptr +=6; /* extra */
 
892
  memset(ptr, 0, 6);                                    ptr +=6; /* extra */
893
893
  return my_write(file, buff, (size_t) (ptr-buff), MYF(MY_NABP)) != 0;
894
894
}
895
895