commit 2e51187b0f9e9b9530a9404fbee8b304edf67e5a Author: Robert Hogan robert@roberthogan.net Date: Mon Feb 14 21:12:11 2011 +0000

More whitespace cleanups --- src/darwin_warts.c | 6 +++--- src/dead_pool.c | 5 +++-- src/parser.c | 13 +++++++------ src/torsocks.h | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/darwin_warts.c b/src/darwin_warts.c index 0a1b922..4cb86f0 100644 --- a/src/darwin_warts.c +++ b/src/darwin_warts.c @@ -56,9 +56,9 @@ int torsocks_select_guts(SELECT_SIGNATURE, int (*original_select)(SELECT_SIGNATU

int select(SELECT_SIGNATURE) { if (!realselect) { - dlerror(); - if ((realselect = dlsym(RTLD_NEXT, "select")) == NULL) - LOAD_ERROR("select", MSGERR); + dlerror(); + if ((realselect = dlsym(RTLD_NEXT, "select")) == NULL) + LOAD_ERROR("select", MSGERR); } return torsocks_select_guts(SELECT_ARGNAMES, realselect); } diff --git a/src/dead_pool.c b/src/dead_pool.c index 3a6f243..c3d8b9b 100644 --- a/src/dead_pool.c +++ b/src/dead_pool.c @@ -28,6 +28,7 @@ #include <stdlib.h> #include <string.h> #include <sys/mman.h> + #include "common.h" #include "dead_pool.h"

@@ -137,7 +138,7 @@ init_pool(unsigned int pool_size, struct in_addr deadrange_base, return newpool; }

-int +int is_dead_address(dead_pool *pool, uint32_t addr) { uint32_t haddr = ntohl(addr); @@ -156,7 +157,7 @@ get_next_dead_address(dead_pool *pool, uint32_t *result) } }

-int +int store_pool_entry(dead_pool *pool, char *hostname, struct in_addr *addr) { int position = pool->write_pos; diff --git a/src/parser.c b/src/parser.c index fe4af0f..9234f8d 100644 --- a/src/parser.c +++ b/src/parser.c @@ -33,6 +33,7 @@ #include <stdlib.h> #include <errno.h> #include <config.h> + #include "common.h" #include "parser.h"

@@ -277,7 +278,7 @@ static int handle_path(struct parsedfile *config, int lineno, int nowords, char config->paths = newserver; currentcontext = newserver; } - + return(0); }

@@ -406,7 +407,7 @@ static int handle_port(struct parsedfile *config, int lineno, char *value) { currentcontext->port = 0; } } - + return(0); }

@@ -425,7 +426,7 @@ static int handle_defuser(struct parsedfile *config, int lineno, char *value) { } else { currentcontext->defuser = strdup(value); } - + return(0); }

@@ -444,7 +445,7 @@ static int handle_defpass(struct parsedfile *config, int lineno, char *value) { } else { currentcontext->defpass = strdup(value); } - + return(0); }

@@ -472,7 +473,7 @@ static int handle_type(struct parsedfile *config, int lineno, char *value) { currentcontext->type = 0; } } - + return(0); }

@@ -486,7 +487,7 @@ static int handle_flag(char *value) return 0; } else { return -1; - } + } }

static int handle_tordns_enabled(struct parsedfile *config, int lineno, diff --git a/src/torsocks.h b/src/torsocks.h index 92ac35c..e75e9a8 100644 --- a/src/torsocks.h +++ b/src/torsocks.h @@ -24,7 +24,7 @@

#define _TORSOCKS_H 1

-#include <parser.h> +#include "parser.h"

/* Structure representing a socks connection request */ struct sockreq {