[Levent-commits] [Libevent/master 4/4] Clean up formatting: function/keyword spacing consistency.

[Nick M. <ni...@us...>]

Author: Nick Mathewson <ni...@to...>
Date: Fri, 19 Feb 2010 03:39:50 -0500
Subject: Clean up formatting: function/keyword spacing consistency.
Commit: 4faeaea90e5d7a5d76acd8891ba88d4ed099edbd

- Keywords always have a space before a paren.  Functions never do.

- No more than 3 blank lines in a row.
---
 bufferevent_filter.c |    2 +-
 devpoll.c            |    6 +++---
 evdns.c              |    5 ++---
 event-internal.h     |    6 +++---
 evutil.c             |    2 +-
 include/event2/rpc.h |    1 -
 minheap-internal.h   |    4 ++--
 sample/event-test.c  |    6 +++---
 sample/signal-test.c |    2 +-
 sample/time-test.c   |    2 +-
 strlcpy.c            |    2 +-
 test/bench.c         |    3 +--
 test/bench_cascade.c |    2 +-
 test/bench_http.c    |    2 +-
 test/regress.c       |    2 --
 test/regress_dns.c   |    4 ++--
 test/test-eof.c      |    2 +-
 test/test-time.c     |    2 +-
 test/test-weof.c     |    2 +-
 win32select.c        |    2 +-
 20 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/bufferevent_filter.c b/bufferevent_filter.c
index 5461e0c..16f17b5 100644
--- a/bufferevent_filter.c
+++ b/bufferevent_filter.c
@@ -456,7 +456,7 @@ be_filter_ctrl(struct bufferevent *bev, enum bufferevent_ctrl_op op,
     union bufferevent_ctrl_data *data)
 {
 	struct bufferevent_filtered *bevf;
-	switch(op) {
+	switch (op) {
 	case BEV_CTRL_GET_UNDERLYING:
 		bevf = upcast(bev);
 		data->ptr = bevf->underlying;
diff --git a/devpoll.c b/devpoll.c
index 527e77d..438d45d 100644
--- a/devpoll.c
+++ b/devpoll.c
@@ -86,10 +86,10 @@ devpoll_commit(struct devpollop *devpollop)
 	 */
 	if (pwrite(devpollop->dpfd, devpollop->changes,
 		sizeof(struct pollfd) * devpollop->nchanges, 0) == -1)
-		return(-1);
+		return (-1);
 
 	devpollop->nchanges = 0;
-	return(0);
+	return (0);
 }
 
 static int
@@ -110,7 +110,7 @@ devpoll_queue(struct devpollop *devpollop, int fd, int events) {
 	pfd->events = events;
 	pfd->revents = 0;
 
-	return(0);
+	return (0);
 }
 
 static void *
diff --git a/evdns.c b/evdns.c
index 944cb35..a597929 100644
--- a/evdns.c
+++ b/evdns.c
@@ -880,7 +880,7 @@ name_parse(u8 *packet, int length, int *idx, char *name_out, int name_out_len) {
 	/* means that the next 14 bits are a pointer within the current */
 	/* packet. */
 
-	for(;;) {
+	for (;;) {
 		u8 label_len;
 		if (j >= length) return -1;
 		GET8(label_len);
@@ -1441,7 +1441,7 @@ dnslabel_table_add(struct dnslabel_table *table, const char *label, off_t pos)
 		return (-1);
 	v = mm_strdup(label);
 	if (v == NULL)
-		return (-1);
+		return(-1);
 	p = table->n_labels++;
 	table->labels[p].v = v;
 	table->labels[p].pos = pos;
@@ -3366,7 +3366,6 @@ evdns_resolv_conf_parse(int flags, const char *const filename) {
 }
 
 
-
 #ifdef WIN32
 /* Add multiple nameservers from a space-or-comma-separated list. */
 static int
diff --git a/event-internal.h b/event-internal.h
index 7d7a282..840f180 100644
--- a/event-internal.h
+++ b/event-internal.h
@@ -228,9 +228,9 @@ struct event_config {
 #define	TAILQ_END(head)			NULL
 #define	TAILQ_NEXT(elm, field)		((elm)->field.tqe_next)
 #define TAILQ_FOREACH(var, head, field)					\
-	for((var) = TAILQ_FIRST(head);					\
-	    (var) != TAILQ_END(head);					\
-	    (var) = TAILQ_NEXT(var, field))
+	for ((var) = TAILQ_FIRST(head);					\
+	     (var) != TAILQ_END(head);					\
+	     (var) = TAILQ_NEXT(var, field))
 #define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
 	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
 	(elm)->field.tqe_next = (listelm);				\
diff --git a/evutil.c b/evutil.c
index 3f17247..a4dc2ef 100644
--- a/evutil.c
+++ b/evutil.c
@@ -328,7 +328,7 @@ evutil_gettimeofday(struct timeval *tv, struct timezone *tz)
 {
 	struct _timeb tb;
 
-	if(tv == NULL)
+	if (tv == NULL)
 		return -1;
 
 	_ftime(&tb);
diff --git a/include/event2/rpc.h b/include/event2/rpc.h
index ad18e4c..b735a1c 100644
--- a/include/event2/rpc.h
+++ b/include/event2/rpc.h
@@ -142,7 +142,6 @@ extern "C" {
 #define EVTAG_ARRAY_LEN(msg, member) ((msg)->member##_length)
 
 
-
 struct evbuffer;
 struct event_base;
 struct evrpc_req_generic;
diff --git a/minheap-internal.h b/minheap-internal.h
index 747f635..bd849bd 100644
--- a/minheap-internal.h
+++ b/minheap-internal.h
@@ -115,7 +115,7 @@ int min_heap_erase(min_heap_t* s, struct event* e)
 
 int min_heap_reserve(min_heap_t* s, unsigned n)
 {
-	if(s->a < n)
+	if (s->a < n)
 	{
 		struct event** p;
 		unsigned a = s->a ? s->a * 2 : 8;
@@ -147,7 +147,7 @@ void min_heap_shift_down_(min_heap_t* s, unsigned hole_index, struct event* e)
     while(min_child <= s->n)
 	{
 	min_child -= min_child == s->n || min_heap_elem_greater(s->p[min_child], s->p[min_child - 1]);
-	if(!(min_heap_elem_greater(e, s->p[min_child])))
+	if (!(min_heap_elem_greater(e, s->p[min_child])))
 	    break;
 	(s->p[hole_index] = s->p[min_child])->ev_timeout_pos.min_heap_idx = hole_index;
 	hole_index = min_child;
diff --git a/sample/event-test.c b/sample/event-test.c
index a057aa5..4dc41f4 100644
--- a/sample/event-test.c
+++ b/sample/event-test.c
@@ -47,7 +47,7 @@ fifo_read(int fd, short event, void *arg)
 	len = ReadFile((HANDLE)fd, buf, sizeof(buf) - 1, &dwBytesRead, NULL);
 
 	/* Check for end of file. */
-	if(len && dwBytesRead == 0) {
+	if (len && dwBytesRead == 0) {
 		fprintf(stderr, "End Of File");
 		event_del(ev);
 		return;
@@ -71,7 +71,7 @@ fifo_read(int fd, short event, void *arg)
 }
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 	struct event evfifo;
 #ifdef WIN32
@@ -85,7 +85,7 @@ main (int argc, char **argv)
 			FILE_ATTRIBUTE_NORMAL,	/* normal file */
 			NULL);			/* no attr. template */
 
-	if(socket == INVALID_HANDLE_VALUE)
+	if (socket == INVALID_HANDLE_VALUE)
 		return 1;
 
 #else
diff --git a/sample/signal-test.c b/sample/signal-test.c
index e8e39de..7b4bbe5 100644
--- a/sample/signal-test.c
+++ b/sample/signal-test.c
@@ -46,7 +46,7 @@ signal_cb(int fd, short event, void *arg)
 }
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 	struct event signal_int;
 	struct event_base* base;
diff --git a/sample/time-test.c b/sample/time-test.c
index 0254018..619bec3 100644
--- a/sample/time-test.c
+++ b/sample/time-test.c
@@ -64,7 +64,7 @@ timeout_cb(evutil_socket_t fd, short event, void *arg)
 }
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 	struct event timeout;
 	struct timeval tv;
diff --git a/strlcpy.c b/strlcpy.c
index 51c37dd..97f81b9 100644
--- a/strlcpy.c
+++ b/strlcpy.c
@@ -69,6 +69,6 @@ _event_strlcpy(dst, src, siz)
 			;
 	}
 
-	return(s - src - 1);	/* count does not include NUL */
+	return (s - src - 1);	/* count does not include NUL */
 }
 #endif
diff --git a/test/bench.c b/test/bench.c
index 570897b..a2d37ba 100644
--- a/test/bench.c
+++ b/test/bench.c
@@ -61,7 +61,6 @@ static int num_pipes, num_active, num_writes;
 static struct event *events;
 
 
-
 static void
 read_cb(int fd, short which, void *arg)
 {
@@ -118,7 +117,7 @@ run_once(void)
 }
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 #ifndef WIN32
 	struct rlimit rl;
diff --git a/test/bench_cascade.c b/test/bench_cascade.c
index 0990c75..1d7892c 100644
--- a/test/bench_cascade.c
+++ b/test/bench_cascade.c
@@ -127,7 +127,7 @@ run_once(int num_pipes)
 }
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 #ifndef WIN32
 	struct rlimit rl;
diff --git a/test/bench_http.c b/test/bench_http.c
index 1f67698..f3ceabb 100644
--- a/test/bench_http.c
+++ b/test/bench_http.c
@@ -83,7 +83,7 @@ http_ref_cb(struct evhttp_request *req, void *arg)
 #endif
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 	struct event_base *base = event_base_new();
 	struct evhttp *http = evhttp_new(base);
diff --git a/test/regress.c b/test/regress.c
index d924582..0f4a687 100644
--- a/test/regress.c
+++ b/test/regress.c
@@ -84,7 +84,6 @@ static struct timeval tset;
 static struct timeval tcalled;
 
 
-
 #define TEST1	"this is a test"
 #define SECONDS	1
 
@@ -1594,7 +1593,6 @@ end:
 }
 
 
-
 static void
 test_methods(void *ptr)
 {
diff --git a/test/regress_dns.c b/test/regress_dns.c
index 1d5883e..854f8df 100644
--- a/test/regress_dns.c
+++ b/test/regress_dns.c
@@ -711,7 +711,7 @@ dumb_bytes_fn(char *p, size_t n)
 	unsigned i;
 	/* This gets us 6 bits of entropy per transaction ID, which means we
 	 * will have probably have collisions and need to pick again. */
-	for(i=0;i<n;++i)
+	for (i=0;i<n;++i)
 		p[i] = (char)(rand() & 7);
 }
 #endif
@@ -740,7 +740,7 @@ dns_inflight_test(void *arg)
 	tt_assert(! evdns_base_set_option(dns, "max-inflight:", "3"));
 	tt_assert(! evdns_base_set_option(dns, "randomize-case:", "0"));
 
-	for(i=0;i<20;++i)
+	for (i=0;i<20;++i)
 		evdns_base_resolve_ipv4(dns, "foof.example.com", 0, generic_dns_callback, &r[i]);
 
 	n_replies_left = 20;
diff --git a/test/test-eof.c b/test/test-eof.c
index 47c6c8b..d0c600c 100644
--- a/test/test-eof.c
+++ b/test/test-eof.c
@@ -58,7 +58,7 @@ read_cb(int fd, short event, void *arg)
 #endif
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 	struct event ev;
 	const char *test = "test string";
diff --git a/test/test-time.c b/test/test-time.c
index a50d295..17a019a 100644
--- a/test/test-time.c
+++ b/test/test-time.c
@@ -58,7 +58,7 @@ time_cb(int fd, short event, void *arg)
 }
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 	struct timeval tv;
 	int i;
diff --git a/test/test-weof.c b/test/test-weof.c
index 6dc752e..a6aa5ea 100644
--- a/test/test-weof.c
+++ b/test/test-weof.c
@@ -59,7 +59,7 @@ write_cb(int fd, short event, void *arg)
 }
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 	struct event ev;
 
diff --git a/win32select.c b/win32select.c
index 98fde72..5987009 100644
--- a/win32select.c
+++ b/win32select.c
@@ -320,7 +320,7 @@ win32_dispatch(struct event_base *base, struct timeval *tv)
 
 	event_debug(("%s: select returned %d", __func__, res));
 
-	if(res <= 0) {
+	if (res <= 0) {
 		evsig_process(base);
 		return res;
 	} else if (base->sig.evsig_caught) {
-- 
1.6.3