← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/myisamchk.c

Removed references to strmov and strnmov

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/myisamchk.c
1170
1170
    }
1171
1171
    pos=buff;
1172
1172
    if (share->state.changed & STATE_CRASHED)
1173
 
      strmov(buff,"crashed");
 
1173
      stpcpy(buff,"crashed");
1174
1174
    else
1175
1175
    {
1176
1176
      if (share->state.open_count)
1177
 
        pos=strmov(pos,"open,");
 
1177
        pos=stpcpy(pos,"open,");
1178
1178
      if (share->state.changed & STATE_CHANGED)
1179
 
        pos=strmov(pos,"changed,");
 
1179
        pos=stpcpy(pos,"changed,");
1180
1180
      else
1181
 
        pos=strmov(pos,"checked,");
 
1181
        pos=stpcpy(pos,"checked,");
1182
1182
      if (!(share->state.changed & STATE_NOT_ANALYZED))
1183
 
        pos=strmov(pos,"analyzed,");
 
1183
        pos=stpcpy(pos,"analyzed,");
1184
1184
      if (!(share->state.changed & STATE_NOT_OPTIMIZED_KEYS))
1185
 
        pos=strmov(pos,"optimized keys,");
 
1185
        pos=stpcpy(pos,"optimized keys,");
1186
1186
      if (!(share->state.changed & STATE_NOT_SORTED_PAGES))
1187
 
        pos=strmov(pos,"sorted index pages,");
 
1187
        pos=stpcpy(pos,"sorted index pages,");
1188
1188
      pos[-1]=0;                                /* Remove extra ',' */
1189
1189
    }      
1190
1190
    printf("Status:              %s\n",buff);
1263
1263
    pos=buff;
1264
1264
    if (keyseg->flag & HA_REVERSE_SORT)
1265
1265
      *pos++ = '-';
1266
 
    pos=strmov(pos,type_names[keyseg->type]);
 
1266
    pos=stpcpy(pos,type_names[keyseg->type]);
1267
1267
    *pos++ = ' ';
1268
1268
    *pos=0;
1269
1269
    if (keyinfo->flag & HA_PACK_KEY)
1270
 
      pos=strmov(pos,prefix_packed_txt);
 
1270
      pos=stpcpy(pos,prefix_packed_txt);
1271
1271
    if (keyinfo->flag & HA_BINARY_PACK_KEY)
1272
 
      pos=strmov(pos,bin_packed_txt);
 
1272
      pos=stpcpy(pos,bin_packed_txt);
1273
1273
    if (keyseg->flag & HA_SPACE_PACK)
1274
 
      pos=strmov(pos,diff_txt);
 
1274
      pos=stpcpy(pos,diff_txt);
1275
1275
    if (keyseg->flag & HA_BLOB_PART)
1276
 
      pos=strmov(pos,blob_txt);
 
1276
      pos=stpcpy(pos,blob_txt);
1277
1277
    if (keyseg->flag & HA_NULL_PART)
1278
 
      pos=strmov(pos,null_txt);
 
1278
      pos=stpcpy(pos,null_txt);
1279
1279
    *pos=0;
1280
1280
 
1281
1281
    printf("%-4d%-6ld%-3d %-8s%-21s",
1294
1294
      pos=buff;
1295
1295
      if (keyseg->flag & HA_REVERSE_SORT)
1296
1296
        *pos++ = '-';
1297
 
      pos=strmov(pos,type_names[keyseg->type]);
 
1297
      pos=stpcpy(pos,type_names[keyseg->type]);
1298
1298
      *pos++= ' ';
1299
1299
      if (keyseg->flag & HA_SPACE_PACK)
1300
 
        pos=strmov(pos,diff_txt);
 
1300
        pos=stpcpy(pos,diff_txt);
1301
1301
      if (keyseg->flag & HA_BLOB_PART)
1302
 
        pos=strmov(pos,blob_txt);
 
1302
        pos=stpcpy(pos,blob_txt);
1303
1303
      if (keyseg->flag & HA_NULL_PART)
1304
 
        pos=strmov(pos,null_txt);
 
1304
        pos=stpcpy(pos,null_txt);
1305
1305
      *pos=0;
1306
1306
      printf("    %-6ld%-3d         %-21s",
1307
1307
             (long) keyseg->start+1,keyseg->length,buff);
1353
1353
        type=share->rec[field].base_type;
1354
1354
      else
1355
1355
        type=(enum en_fieldtype) share->rec[field].type;
1356
 
      end=strmov(buff,field_pack[type]);
 
1356
      end=stpcpy(buff,field_pack[type]);
1357
1357
      if (share->options & HA_OPTION_COMPRESS_RECORD)
1358
1358
      {
1359
1359
        if (share->rec[field].pack_type & PACK_TYPE_SELECTED)
1360
 
          end=strmov(end,", not_always");
 
1360
          end=stpcpy(end,", not_always");
1361
1361
        if (share->rec[field].pack_type & PACK_TYPE_SPACE_FIELDS)
1362
 
          end=strmov(end,", no empty");
 
1362
          end=stpcpy(end,", no empty");
1363
1363
        if (share->rec[field].pack_type & PACK_TYPE_ZERO_FILL)
1364
1364
        {
1365
1365
          sprintf(end,", zerofill(%d)",share->rec[field].space_length_bits);
1367
1367
        }
1368
1368
      }
1369
1369
      if (buff[0] == ',')
1370
 
        strmov(buff,buff+2);
 
1370
        stpcpy(buff,buff+2);
1371
1371
      int10_to_str((long) share->rec[field].length,length,10);
1372
1372
      null_bit[0]=null_pos[0]=0;
1373
1373
      if (share->rec[field].null_bit)