← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/log.cc

Removed my_vsnprintf and my_snprintf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/log.cc
555
555
 
556
556
  /* prepare message */
557
557
  if (format)
558
 
    message_buff_len= my_vsnprintf(message_buff, sizeof(message_buff),
 
558
    message_buff_len= vsnprintf(message_buff, sizeof(message_buff),
559
559
                                   format, args);
560
560
  else
561
561
    message_buff[0]= '\0';
1303
1303
  if (log_type == LOG_NORMAL)
1304
1304
  {
1305
1305
    char *end;
1306
 
    int len=my_snprintf(buff, sizeof(buff), "%s, Version: %s (%s). "
1307
 
                        "started with:\nTCP Port: %d, Named Pipe: %s\n",
1308
 
                        my_progname, server_version, MYSQL_COMPILATION_COMMENT,
1309
 
                        mysqld_port, ""
1310
 
                       );
 
1306
    int len=snprintf(buff, sizeof(buff), "%s, Version: %s (%s). "
 
1307
                     "started with:\nTCP Port: %d, Named Pipe: %s\n",
 
1308
                     my_progname, server_version, MYSQL_COMPILATION_COMMENT,
 
1309
                     mysqld_port, ""
 
1310
                     );
1311
1311
    end= strnmov(buff + len, "Time                 Id Command    Argument\n",
1312
1312
                 sizeof(buff) - len);
1313
1313
    if (my_b_write(&log_file, (uchar*) buff, (uint) (end-buff)) ||
1514
1514
 
1515
1515
        localtime_r(&event_time, &start);
1516
1516
 
1517
 
        time_buff_len= my_snprintf(local_time_buff, MAX_TIME_SIZE,
1518
 
                                   "%02d%02d%02d %2d:%02d:%02d",
1519
 
                                   start.tm_year % 100, start.tm_mon + 1,
1520
 
                                   start.tm_mday, start.tm_hour,
1521
 
                                   start.tm_min, start.tm_sec);
 
1517
        time_buff_len= snprintf(local_time_buff, MAX_TIME_SIZE,
 
1518
                                "%02d%02d%02d %2d:%02d:%02d",
 
1519
                                start.tm_year % 100, start.tm_mon + 1,
 
1520
                                start.tm_mday, start.tm_hour,
 
1521
                                start.tm_min, start.tm_sec);
1522
1522
 
1523
1523
        if (my_b_write(&log_file, (uchar*) local_time_buff, time_buff_len))
1524
1524
          goto err;
1528
1528
          goto err;
1529
1529
 
1530
1530
      /* command_type, thread_id */
1531
 
      length= my_snprintf(buff, 32, "%5ld ", (long) thread_id);
 
1531
      length= snprintf(buff, 32, "%5ld ", (long) thread_id);
1532
1532
 
1533
1533
    if (my_b_write(&log_file, (uchar*) buff, length))
1534
1534
      goto err;
1624
1624
        struct tm start;
1625
1625
        localtime_r(&current_time, &start);
1626
1626
 
1627
 
        buff_len= my_snprintf(buff, sizeof buff,
1628
 
                              "# Time: %02d%02d%02d %2d:%02d:%02d\n",
1629
 
                              start.tm_year % 100, start.tm_mon + 1,
1630
 
                              start.tm_mday, start.tm_hour,
1631
 
                              start.tm_min, start.tm_sec);
 
1627
        buff_len= snprintf(buff, sizeof buff,
 
1628
                           "# Time: %02d%02d%02d %2d:%02d:%02d\n",
 
1629
                           start.tm_year % 100, start.tm_mon + 1,
 
1630
                           start.tm_mday, start.tm_hour,
 
1631
                           start.tm_min, start.tm_sec);
1632
1632
 
1633
1633
        /* Note that my_b_write() assumes it knows the length for this */
1634
1634
        if (my_b_write(&log_file, (uchar*) buff, buff_len))
4063
4063
  int error_code= errno;
4064
4064
  DBUG_ENTER("vprint_msg_to_log");
4065
4065
 
4066
 
  length= my_vsnprintf(buff, sizeof(buff), format, args);
 
4066
  length= vsnprintf(buff, sizeof(buff), format, args);
4067
4067
 
4068
4068
  print_buffer_to_file(level, error_code, buff, length);
4069
4069