[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] Clean/renormalize whitespace
Update of /home/or/cvsroot/tor/src/or
In directory moria.mit.edu:/tmp/cvs-serv16096/src/or
Modified Files:
buffers.c connection.c test.c
Log Message:
Clean/renormalize whitespace
Index: buffers.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/buffers.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- buffers.c 26 Apr 2005 20:53:22 -0000 1.135
+++ buffers.c 26 Apr 2005 20:55:32 -0000 1.136
@@ -25,12 +25,12 @@
#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 @@
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 @@
}
}
-
/** 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 @@
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)
Index: connection.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/connection.c,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -d -r1.364 -r1.365
--- connection.c 26 Apr 2005 18:52:15 -0000 1.364
+++ connection.c 26 Apr 2005 20:55:32 -0000 1.365
@@ -125,7 +125,6 @@
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.
*
Index: test.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/test.c,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- test.c 26 Apr 2005 20:53:22 -0000 1.173
+++ test.c 26 Apr 2005 20:55:32 -0000 1.174
@@ -156,7 +156,7 @@
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 @@
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_memeq(str2, str, 255);
}
-
/****
* read_to_buf
****/