Update copyright range

[privoxy.git] / gateway.c

diff --git a/gateway.c b/gateway.c
index abc7272..f36ed01 100644 (file)
--- a/gateway.c
+++ b/gateway.c
@@ -1,4 +1,4 @@
-const char gateway_rcs[] = "$Id: gateway.c,v 1.84 2012/02/29 19:35:11 fabiankeil Exp $";
+const char gateway_rcs[] = "$Id: gateway.c,v 1.86 2012/03/09 17:55:50 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/gateway.c,v $
@@ -377,7 +377,7 @@ int connection_destination_matches(const struct reusable_connection *connection,
       return FALSE;
    }
 
-   if ((   (NULL != connection->gateway_host)
+   if ((    (NULL != connection->gateway_host)
          && (NULL != fwd->gateway_host)
          && strcmpic(connection->gateway_host, fwd->gateway_host))
        && (connection->gateway_host != fwd->gateway_host))
@@ -388,7 +388,7 @@ int connection_destination_matches(const struct reusable_connection *connection,
       return FALSE;
    }
 
-   if ((   (NULL != connection->forward_host)
+   if ((    (NULL != connection->forward_host)
          && (NULL != fwd->forward_host)
          && strcmpic(connection->forward_host, fwd->forward_host))
       && (connection->forward_host != fwd->forward_host))
@@ -1077,7 +1077,7 @@ static jb_socket socks5_connect(const struct forward_spec *fwd,
    strncpy(cbuf + client_pos, target_host, sizeof(cbuf) - client_pos);
    client_pos += (hostlen & 0xffu);
    cbuf[client_pos++] = (char)((target_port >> 8) & 0xff);
-   cbuf[client_pos++] = (char)((target_port    ) & 0xff);
+   cbuf[client_pos++] = (char)((target_port     ) & 0xff);
 
    if (write_socket(sfd, cbuf, client_pos))
    {
@@ -1116,16 +1116,7 @@ static jb_socket socks5_connect(const struct forward_spec *fwd,
 
    assert(errstr != NULL);
    csp->error_message = strdup(errstr);
-   if (server_size == -1)
-   {
-      /*
-       * We didn't read() anything from the server at all.
-       * Don't try to log a negative number of characters
-       * which could trigger an assert().
-       */
-      server_size = 0;
-   }
-   log_error(LOG_LEVEL_CONNECT, "socks5_connect: %s: %N", errstr, server_size, sbuf);
+   log_error(LOG_LEVEL_CONNECT, "socks5_connect: %s", errstr);
    close_socket(sfd);
    errno = EINVAL;