Commit dc753b83 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Gisle Vanem fixed a windows compiler warning

parent a5c4442e

lib/telnet.c

+42 −44
Original line number Diff line number Diff line
@@ -1043,13 +1043,14 @@ CURLcode Curl_telnet(struct connectdata *conn) 
  HANDLE stdin_handle;

  HANDLE objs[2];

  DWORD waitret;

  DWORD nread;

#else

  fd_set readfd;

  fd_set keepfd;

  ssize_t nread;  

#endif

  bool keepon = TRUE;

  char *buf = data->state.buffer;

  ssize_t nread;

  struct TELNET *tn;



  code = init_telnet(conn);
@@ -1086,8 +1087,7 @@ CURLcode Curl_telnet(struct connectdata *conn) 
  /* Keep on listening and act on events */

  while(keepon) {

    waitret = WaitForMultipleObjects(2, objs, FALSE, INFINITE);

    switch(waitret - WAIT_OBJECT_0)

    {

    switch(waitret - WAIT_OBJECT_0) {

    case 0:

    {

      unsigned char outbuf[2];
@@ -1095,7 +1095,8 @@ CURLcode Curl_telnet(struct connectdata *conn) 
      ssize_t bytes_written;

      char *buffer = buf;

              

        if(!ReadFile(stdin_handle, buf, 255, (LPDWORD)&nread, NULL)) {

      if(!ReadFile(stdin_handle, buf, sizeof(data->state.buffer),

                   (LPDWORD)&nread, NULL)) {

        keepon = FALSE;

        break;

      }
@@ -1114,10 +1115,8 @@ CURLcode Curl_telnet(struct connectdata *conn) 
      

    case 1:

      if(WSAEnumNetworkEvents(sockfd, event_handle, &events)

           != SOCKET_ERROR)

        {

          if(events.lNetworkEvents & FD_READ)

          {

         != SOCKET_ERROR) {

        if(events.lNetworkEvents & FD_READ) {

          /* This reallu OUGHT to check its return code. */

          Curl_read(conn, sockfd, buf, BUFSIZE - 1, &nread);
@@ -1134,8 +1133,7 @@ CURLcode Curl_telnet(struct connectdata *conn) 
          }

        }

          

          if(events.lNetworkEvents & FD_CLOSE)

          {

        if(events.lNetworkEvents & FD_CLOSE) {

          keepon = FALSE;

        }

      }