← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/mysqltest.c

Removed my_vsnprintf and my_snprintf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/mysqltest.c
1064
1064
    dynstr_append(&ds_warning_messages, "Warning detected ");
1065
1065
    if (cur_file && cur_file != file_stack)
1066
1066
    {
1067
 
      len= my_snprintf(buff, sizeof(buff), "in included file %s ",
 
1067
      len= snprintf(buff, sizeof(buff), "in included file %s ",
1068
1068
                       cur_file->file_name);
1069
1069
      dynstr_append_mem(&ds_warning_messages,
1070
1070
                        buff, len);
1071
1071
    }
1072
 
    len= my_snprintf(buff, sizeof(buff), "at line %d: ",
 
1072
    len= snprintf(buff, sizeof(buff), "at line %d: ",
1073
1073
                     start_lineno);
1074
1074
    dynstr_append_mem(&ds_warning_messages,
1075
1075
                      buff, len);
1076
1076
  }
1077
1077
 
1078
 
  len= my_vsnprintf(buff, sizeof(buff), fmt, args);
 
1078
  len= vsnprintf(buff, sizeof(buff), fmt, args);
1079
1079
  dynstr_append_mem(&ds_warning_messages, buff, len);
1080
1080
 
1081
1081
  dynstr_append(&ds_warning_messages, "\n");
1093
1093
  DBUG_ENTER("log_msg");
1094
1094
 
1095
1095
  va_start(args, fmt);
1096
 
  len= my_vsnprintf(buff, sizeof(buff)-1, fmt, args);
 
1096
  len= vsnprintf(buff, sizeof(buff)-1, fmt, args);
1097
1097
  va_end(args);
1098
1098
 
1099
1099
  dynstr_append_mem(&ds_res, buff, len);
1783
1783
      v->int_dirty= 0;
1784
1784
      v->str_val_len= strlen(v->str_val);
1785
1785
    }
1786
 
    my_snprintf(buf, sizeof(buf), "%.*s=%.*s",
 
1786
    snprintf(buf, sizeof(buf), "%.*s=%.*s",
1787
1787
                v->name_len, v->name,
1788
1788
                v->str_val_len, v->str_val);
1789
1789
    if (!(v->env_s= my_strdup(buf, MYF(MY_WME))))
1804
1804
static void var_set_int(const char* name, int value)
1805
1805
{
1806
1806
  char buf[21];
1807
 
  my_snprintf(buf, sizeof(buf), "%d", value);
 
1807
  snprintf(buf, sizeof(buf), "%d", value);
1808
1808
  var_set_string(name, buf);
1809
1809
}
1810
1810
 
3090
3090
  str_to_file(temp_file_path, ds_script.str, ds_script.length);
3091
3091
 
3092
3092
  /* Format the "perl <filename>" command */
3093
 
  my_snprintf(buf, sizeof(buf), "perl %s", temp_file_path);
 
3093
  snprintf(buf, sizeof(buf), "perl %s", temp_file_path);
3094
3094
 
3095
3095
  if (!(res_file= popen(buf, "r")) && command->abort_on_error)
3096
3096
    die("popen(\"%s\", \"r\") failed", buf);