← Back to branch summary

~linuxjedi/libdrizzle/5.1-fix-wine

« back to all changes in this revision

Viewing changes to libdrizzle/conn.cc

  • Committer: Continuous Integration
  • Date: 2012-12-31 01:08:39 UTC
  • mfrom: (73.1.3 5.1-trunk)
  • Revision ID: ci@drizzle.org-20121231010839-8hg9bazx84mj03fw
Merge lp:~brianaker/libdrizzle/private-headers-connection-test Build: jenkins-Libdrizzle-25

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/conn.cc
799
799
drizzle_return_t drizzle_state_addrinfo(drizzle_st *con)
800
800
{
801
801
  drizzle_tcp_st *tcp;
802
 
  const char *host;
803
 
  char port[NI_MAXSERV];
804
802
  struct addrinfo ai;
805
803
 
806
804
  if (con == NULL)
822
820
        tcp->addrinfo= NULL;
823
821
      }
824
822
 
 
823
      char port[NI_MAXSERV];
825
824
      if (tcp->port != 0)
826
825
      {
827
826
        snprintf(port, NI_MAXSERV, "%u", tcp->port);
837
836
      ai.ai_protocol= IPPROTO_TCP;
838
837
      ai.ai_family= AF_UNSPEC;
839
838
 
 
839
      const char *host;
840
840
      if (tcp->host == NULL)
841
841
      {
842
842
        host= DRIZZLE_DEFAULT_TCP_HOST;