aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-04-26 20:55:32 +0000
committerNick Mathewson <nickm@torproject.org>2005-04-26 20:55:32 +0000
commit9ba2dd7ea1b1984c935dae3ac866484a4307c4dc (patch)
tree0a88c48b329043584a24d22e231876ac6f3de8d4 /src/or
parentef2409e4ed367f7fe6f8b95ca874fbaf81f96e4b (diff)
downloadtor-9ba2dd7ea1b1984c935dae3ac866484a4307c4dc.tar
tor-9ba2dd7ea1b1984c935dae3ac866484a4307c4dc.tar.gz
Clean/renormalize whitespace
svn:r4122
Diffstat (limited to 'src/or')
-rw-r--r--src/or/buffers.c7
-rw-r--r--src/or/connection.c1
-rw-r--r--src/or/test.c5
3 files changed, 4 insertions, 9 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c
index c5fcd6fe5..937e33592 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -25,12 +25,12 @@ const char buffers_c_id[] = "$Id$";
#define GUARDED_MEM(m) ((m)+4)
#define ALLOC_LEN(ln) ((ln)+8)
#define SET_GUARDS(m, ln) \
- do { set_uint32((m)-4, START_MAGIC); set_uint32((m)+ln, END_MAGIC); }while(0)
+ do { set_uint32((m)-4,START_MAGIC); set_uint32((m)+ln,END_MAGIC); } while (0)
#else
#define RAW_MEM(m) (m)
#define GUARDED_MEM(m) (m)
#define ALLOC_LEN(ln) (ln)
-#define SET_GUARDS(m,ln) do {} while(0)
+#define SET_GUARDS(m,ln) do {} while (0)
#endif
#define BUFFER_MAGIC 0xB0FFF312u
@@ -76,7 +76,6 @@ static INLINE char *_buf_end(buf_t *buf)
return (next < end) ? next : (next - buf->len);
}
-
/** If the pointer <b>cp</b> has passed beyond the end of the buffer, wrap it
* around. */
static INLINE char *_wrap_ptr(buf_t *buf, char *cp) {
@@ -449,7 +448,6 @@ flush_buf_impl(int s, buf_t *buf, size_t sz, size_t *buf_flushlen)
}
}
-
/** Write data from <b>buf</b> to the socket <b>s</b>. Write at most
* <b>*buf_flushlen</b> bytes, decrement <b>*buf_flushlen</b> by
* the number of bytes actually written, and remove the written bytes
@@ -509,7 +507,6 @@ flush_buf_tls_impl(tor_tls *tls, buf_t *buf, size_t sz, size_t *buf_flushlen)
return r;
}
-
/** As flush_buf, but writes data to a TLS connection.
*/
int flush_buf_tls(tor_tls *tls, buf_t *buf, size_t *buf_flushlen)
diff --git a/src/or/connection.c b/src/or/connection.c
index a3ee4554e..f1caeef86 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -125,7 +125,6 @@ conn_state_to_string(int type, int state) {
return buf;
}
-
/** Allocate space for a new connection_t. This function just initializes
* conn; you must call connection_add() to link it into the main array.
*
diff --git a/src/or/test.c b/src/or/test.c
index 2a568b54d..42dd1c176 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -156,7 +156,7 @@ test_buffers(void) {
memset(str2, 0, sizeof(str2));
/* Okay, now we should be 512 bytes into the 4096-byte buffer. If we add
* another 3584 bytes, we hit the end. */
- for(j=0;j<15;++j) {
+ for (j=0;j<15;++j) {
write_to_buf(str, 256, buf);
}
assert_buf_ok(buf);
@@ -164,7 +164,7 @@ test_buffers(void) {
fetch_from_buf(str2, 56, buf);
test_eq(buf_datalen(buf), 3840);
test_memeq(str+200, str2, 56);
- for(j=0;j<15;++j) {
+ for (j=0;j<15;++j) {
memset(str2, 0, sizeof(str2));
fetch_from_buf(str2, 256, buf);
test_memeq(str, str2, 256);
@@ -230,7 +230,6 @@ test_buffers(void) {
test_memeq(str2, str, 255);
}
-
/****
* read_to_buf
****/