From: Nick Mathewson Date: Fri, 19 Feb 2010 08:39:50 +0000 (-0500) Subject: Clean up formatting: function/keyword spacing consistency. X-Git-Tag: release-2.0.4-alpha~18 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4faeaea90e5d7a5d76acd8891ba88d4ed099edbd;p=libevent Clean up formatting: function/keyword spacing consistency. - Keywords always have a space before a paren. Functions never do. - No more than 3 blank lines in a row. --- diff --git a/bufferevent_filter.c b/bufferevent_filter.c index 5461e0c7..16f17b5a 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 527e77d3..438d45d8 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 944cb350..a597929f 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 7d7a2826..840f180e 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 3f172474..a4dc2ef6 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 ad18e4c3..b735a1c0 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 747f635a..bd849bdf 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 a057aa55..4dc41f49 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 e8e39de9..7b4bbe51 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 02540181..619bec38 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 51c37dd1..97f81b90 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 570897b4..a2d37ba0 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 0990c75e..1d7892c5 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 1f67698a..f3ceabb9 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 d9245821..0f4a6876 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 1d5883e1..854f8df2 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;isig.evsig_caught) {