← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/unireg.cc

  • Committer: Brian Aker
  • Date: 2008-08-09 21:43:24 UTC
  • mfrom: (279.1.4 codestyle)
  • Revision ID: brian@tangent.org-20080809214324-jy2c15bx49naddsf
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/unireg.cc
522
522
  *pos++=(uchar) NAMES_SEP_CHAR;
523
523
  for (key=keyinfo ; key != end ; key++)
524
524
  {
525
 
    uchar *tmp=(uchar*) strmov((char*) pos,key->name);
 
525
    uchar *tmp=(uchar*) stpcpy((char*) pos,key->name);
526
526
    *tmp++= (uchar) NAMES_SEP_CHAR;
527
527
    *tmp=0;
528
528
    pos=tmp;
534
534
    if (key->flags & HA_USES_COMMENT)
535
535
    {
536
536
      int2store(pos, key->comment.length);
537
 
      uchar *tmp= (uchar*)strnmov((char*) pos+2,key->comment.str,key->comment.length);
 
537
      uchar *tmp= (uchar*)stpncpy((char*) pos+2,key->comment.str,key->comment.length);
538
538
      pos= tmp;
539
539
    }
540
540
  }
795
795
  it.rewind();
796
796
  while ((field=it++))
797
797
  {
798
 
    char *pos= strmov((char*) buff,field->field_name);
 
798
    char *pos= stpcpy((char*) buff,field->field_name);
799
799
    *pos++=NAMES_SEP_CHAR;
800
800
    if (i == create_fields.elements-1)
801
801
      *pos++=0;