← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libmysql/client.c

Removed my_vsnprintf and my_snprintf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libmysql/client.c
344
344
  net= &mysql->net;
345
345
  net->last_errno= errcode;
346
346
  va_start(args, format);
347
 
  my_vsnprintf(net->last_error, sizeof(net->last_error)-1,
 
347
  vsnprintf(net->last_error, sizeof(net->last_error)-1,
348
348
               format, args);
349
349
  va_end(args);
350
350
  strmov(net->sqlstate, sqlstate);
1781
1781
      mysql->options.protocol=MYSQL_PROTOCOL_MEMORY;
1782
1782
      unix_socket = 0;
1783
1783
      host=mysql->options.shared_memory_base_name;
1784
 
      my_snprintf(host_info=buff, sizeof(buff)-1,
1785
 
                  ER(CR_SHARED_MEMORY_CONNECTION), host);
 
1784
      snprintf(host_info=buff, sizeof(buff)-1,
 
1785
               ER(CR_SHARED_MEMORY_CONNECTION), host);
1786
1786
    }
1787
1787
  }
1788
1788
#endif /* HAVE_SMEM */
1862
1862
    else
1863
1863
    {
1864
1864
      net->vio=vio_new_win32pipe(hPipe);
1865
 
      my_snprintf(host_info=buff, sizeof(buff)-1,
1866
 
                  ER(CR_NAMEDPIPE_CONNECTION), unix_socket);
 
1865
      snprintf(host_info=buff, sizeof(buff)-1,
 
1866
               ER(CR_NAMEDPIPE_CONNECTION), unix_socket);
1867
1867
    }
1868
1868
  }
1869
1869
#endif
1883
1883
    if (!host)
1884
1884
      host= LOCAL_HOST;
1885
1885
 
1886
 
    my_snprintf(host_info=buff, sizeof(buff)-1, ER(CR_TCP_CONNECTION), host);
 
1886
    snprintf(host_info=buff, sizeof(buff)-1, ER(CR_TCP_CONNECTION), host);
1887
1887
    DBUG_PRINT("info",("Server name: '%s'.  TCP sock: %d", host, port));
1888
1888
#ifdef MYSQL_SERVER
1889
1889
    thr_alarm_init(&alarmed);
1902
1902
    hints.ai_family= AF_UNSPEC;
1903
1903
 
1904
1904
    DBUG_PRINT("info",("IPV6 getaddrinfo %s", host));
1905
 
    my_snprintf(port_buf, NI_MAXSERV, "%d", port);
 
1905
    snprintf(port_buf, NI_MAXSERV, "%d", port);
1906
1906
    gai_errno= getaddrinfo(host, port_buf, &hints, &res_lst);
1907
1907
 
1908
1908
    if (gai_errno != 0)