Commit b49cf6a7 authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

Fix whitespace in bufferevents branch

parent a16ed90e

src/common/compat_libevent.c

+2 −2
Changes for src/common/compat_libevent.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -558,9 +558,9 @@ static const struct timeval *one_tick = NULL; 
 * implementation should be used. Only use this when the timer is supposed

 * to fire after 1 / TOR_LIBEVENT_TICKS_PER_SECOND seconds have passed.

*/

const struct timeval *tor_libevent_get_one_tick_timeout(void)

const struct timeval *

tor_libevent_get_one_tick_timeout(void)

{



  if (PREDICT_UNLIKELY(one_tick == NULL)) {

    struct event_base *base = tor_libevent_get_base();

    struct timeval tv;

src/common/tortls.c

+2 −1
Changes for src/common/tortls.c: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -1273,7 +1273,8 @@ tor_tls_start_renegotiating(tor_tls_t *tls) 
{

  int r = SSL_renegotiate(tls->ssl);

  if (r <= 0) {

    return tor_tls_get_error(tls, r, 0, "renegotiating", LOG_WARN, LD_HANDSHAKE);

    return tor_tls_get_error(tls, r, 0, "renegotiating", LOG_WARN,

                             LD_HANDSHAKE);

  }

  return 0;

}

src/or/buffers.c

+4 −4
Changes for src/or/buffers.c: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -1516,7 +1516,8 @@ fetch_from_evbuffer_socks(struct evbuffer *buf, socks_request_t *req, 
    return 0;



  {

    /* See if we can find the socks request in the first chunk of the buffer. */

    /* See if we can find the socks request in the first chunk of the buffer.

     */

    struct evbuffer_iovec v;

    int i;

    want_length = evbuffer_get_contiguous_space(buf);
@@ -1573,9 +1574,8 @@ fetch_from_evbuffer_socks(struct evbuffer *buf, socks_request_t *req, 
      break;

    /* Otherwise, it wants more data than we gave it.  If we can provide more

     * data than we gave it, we'll try to do so in the next iteration of the

     * loop. If we can't, the while() condition will exit.  It's okay if it

     * asked for more than we have total; maybe it doesn't really need so

     * much. */

     * loop. If we can't, the while loop will exit.  It's okay if it asked for

     * more than we have total; maybe it doesn't really need so much. */

  }



  return res;