← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/unireg.cc

  • Committer: Toru Maesaka
  • Date: 2008-12-01 11:00:41 UTC
  • mto: (632.1.17 devel)
  • mto: This revision was merged to the branch mainline in revision 637.
  • Revision ID: dev@torum.net-20081201110041-gia57w4pw4qwh13t
Third pass of replacing MySQL's strmake() with libc calls

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/unireg.cc
209
209
    create_info->extra_size+= 2 + create_info->comment.length;
210
210
  }
211
211
  else{
212
 
    strmake((char*) forminfo+47, create_info->comment.str ?
 
212
    strncpy((char*) forminfo+47, create_info->comment.str ?
213
213
            create_info->comment.str : "", create_info->comment.length);
214
214
    forminfo[46]=(unsigned char) create_info->comment.length;
215
215
#ifdef EXTRA_DEBUG
734
734
      pos[0]=(unsigned char) row;
735
735
      pos[1]=0;
736
736
      pos[2]=(unsigned char) (length+1);
737
 
      pos=(unsigned char*) strmake((char*) pos+3,cfield->field_name,length)+1;
 
737
      strncpy((char*)pos+3,cfield->field_name, length);
 
738
      pos[length + 3]= '\0';
 
739
      pos+= length + 3 + 1;
738
740
    }
739
741
    cfield->row=(uint8_t) row;
740
742
    cfield->col=(uint8_t) (length+1);