j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

K&R style braces

Browse source
This commit is contained in:
Guus Sliepen 2007-05-18 10:00:00 +00:00
parent 760dd966ef
commit f02d3ed3e1
30 changed files with 233 additions and 466 deletions
Download patch file Download diff file Expand all files Collapse all files

93
lib/avl_tree.c
View file

@ -54,8 +54,7 @@
#ifndef AVL_DEPTH
static int lg(unsigned int u) __attribute__ ((__const__));
static int lg(unsigned int u)
{
static int lg(unsigned int u) {
int r = 1;
if(!u)
@ -90,8 +89,7 @@ static int lg(unsigned int u)
/* Internal helper functions */
static int avl_check_balance(const avl_node_t *node)
{
static int avl_check_balance(const avl_node_t *node) {
#ifdef AVL_DEPTH
int d;
@ -118,8 +116,7 @@ static int avl_check_balance(const avl_node_t *node)
#endif
}
static void avl_rebalance(avl_tree_t *tree, avl_node_t *node)
{
static void avl_rebalance(avl_tree_t *tree, avl_node_t *node) {
avl_node_t *child;
avl_node_t *gchild;
avl_node_t *parent;
@ -262,8 +259,7 @@ static void avl_rebalance(avl_tree_t *tree, avl_node_t *node)
/* (De)constructors */
avl_tree_t *avl_alloc_tree(avl_compare_t compare, avl_action_t delete)
{
avl_tree_t *avl_alloc_tree(avl_compare_t compare, avl_action_t delete) {
avl_tree_t *tree;
tree = xmalloc_and_zero(sizeof(avl_tree_t));
@ -273,18 +269,15 @@ avl_tree_t *avl_alloc_tree(avl_compare_t compare, avl_action_t delete)
return tree;
}
void avl_free_tree(avl_tree_t *tree)
{
void avl_free_tree(avl_tree_t *tree) {
free(tree);
}
avl_node_t *avl_alloc_node(void)
{
avl_node_t *avl_alloc_node(void) {
return xmalloc_and_zero(sizeof(avl_node_t));
}
void avl_free_node(avl_tree_t *tree, avl_node_t *node)
{
void avl_free_node(avl_tree_t *tree, avl_node_t *node) {
if(node->data && tree->delete)
tree->delete(node->data);
@ -293,8 +286,7 @@ void avl_free_node(avl_tree_t *tree, avl_node_t *node)
/* Searching */
void *avl_search(const avl_tree_t *tree, const void *data)
{
void *avl_search(const avl_tree_t *tree, const void *data) {
avl_node_t *node;
node = avl_search_node(tree, data);
@ -302,8 +294,7 @@ void *avl_search(const avl_tree_t *tree, const void *data)
return node ? node->data : NULL;
}
void *avl_search_closest(const avl_tree_t *tree, const void *data, int *result)
{
void *avl_search_closest(const avl_tree_t *tree, const void *data, int *result) {
avl_node_t *node;
node = avl_search_closest_node(tree, data, result);
@ -311,8 +302,7 @@ void *avl_search_closest(const avl_tree_t *tree, const void *data, int *result)
return node ? node->data : NULL;
}
void *avl_search_closest_smaller(const avl_tree_t *tree, const void *data)
{
void *avl_search_closest_smaller(const avl_tree_t *tree, const void *data) {
avl_node_t *node;
node = avl_search_closest_smaller_node(tree, data);
@ -320,8 +310,7 @@ void *avl_search_closest_smaller(const avl_tree_t *tree, const void *data)
return node ? node->data : NULL;
}
void *avl_search_closest_greater(const avl_tree_t *tree, const void *data)
{
void *avl_search_closest_greater(const avl_tree_t *tree, const void *data) {
avl_node_t *node;
node = avl_search_closest_greater_node(tree, data);
@ -329,8 +318,7 @@ void *avl_search_closest_greater(const avl_tree_t *tree, const void *data)
return node ? node->data : NULL;
}
avl_node_t *avl_search_node(const avl_tree_t *tree, const void *data)
{
avl_node_t *avl_search_node(const avl_tree_t *tree, const void *data) {
avl_node_t *node;
int result;
@ -340,8 +328,7 @@ avl_node_t *avl_search_node(const avl_tree_t *tree, const void *data)
}
avl_node_t *avl_search_closest_node(const avl_tree_t *tree, const void *data,
int *result)
{
int *result) {
avl_node_t *node;
int c;
@ -383,8 +370,7 @@ avl_node_t *avl_search_closest_node(const avl_tree_t *tree, const void *data,
}
avl_node_t *avl_search_closest_smaller_node(const avl_tree_t *tree,
const void *data)
{
const void *data) {
avl_node_t *node;
int result;
@ -397,8 +383,7 @@ avl_node_t *avl_search_closest_smaller_node(const avl_tree_t *tree,
}
avl_node_t *avl_search_closest_greater_node(const avl_tree_t *tree,
const void *data)
{
const void *data) {
avl_node_t *node;
int result;
@ -412,8 +397,7 @@ avl_node_t *avl_search_closest_greater_node(const avl_tree_t *tree,
/* Insertion and deletion */
avl_node_t *avl_insert(avl_tree_t *tree, void *data)
{
avl_node_t *avl_insert(avl_tree_t *tree, void *data) {
avl_node_t *closest, *new;
int result;
@ -452,8 +436,7 @@ avl_node_t *avl_insert(avl_tree_t *tree, void *data)
return new;
}
avl_node_t *avl_insert_node(avl_tree_t *tree, avl_node_t *node)
{
avl_node_t *avl_insert_node(avl_tree_t *tree, avl_node_t *node) {
avl_node_t *closest;
int result;
@ -486,15 +469,13 @@ avl_node_t *avl_insert_node(avl_tree_t *tree, avl_node_t *node)
return node;
}
void avl_insert_top(avl_tree_t *tree, avl_node_t *node)
{
void avl_insert_top(avl_tree_t *tree, avl_node_t *node) {
node->prev = node->next = node->parent = NULL;
tree->head = tree->tail = tree->root = node;
}
void avl_insert_before(avl_tree_t *tree, avl_node_t *before,
avl_node_t *node)
{
avl_node_t *node) {
if(!before) {
if(tree->tail)
avl_insert_after(tree, tree->tail, node);
@ -523,8 +504,7 @@ void avl_insert_before(avl_tree_t *tree, avl_node_t *before,
avl_rebalance(tree, before);
}
void avl_insert_after(avl_tree_t *tree, avl_node_t *after, avl_node_t *node)
{
void avl_insert_after(avl_tree_t *tree, avl_node_t *after, avl_node_t *node) {
if(!after) {
if(tree->head)
avl_insert_before(tree, tree->head, node);
@ -553,8 +533,7 @@ void avl_insert_after(avl_tree_t *tree, avl_node_t *after, avl_node_t *node)
avl_rebalance(tree, after);
}
avl_node_t *avl_unlink(avl_tree_t *tree, void *data)
{
avl_node_t *avl_unlink(avl_tree_t *tree, void *data) {
avl_node_t *node;
node = avl_search_node(tree, data);
@ -565,8 +544,7 @@ avl_node_t *avl_unlink(avl_tree_t *tree, void *data)
return node;
}
void avl_unlink_node(avl_tree_t *tree, avl_node_t *node)
{
void avl_unlink_node(avl_tree_t *tree, avl_node_t *node) {
avl_node_t *parent;
avl_node_t **superparent;
avl_node_t *subst, *left, *right;
@ -634,14 +612,12 @@ void avl_unlink_node(avl_tree_t *tree, avl_node_t *node)
#endif
}
void avl_delete_node(avl_tree_t *tree, avl_node_t *node)
{
void avl_delete_node(avl_tree_t *tree, avl_node_t *node) {
avl_unlink_node(tree, node);
avl_free_node(tree, node);
}
void avl_delete(avl_tree_t *tree, void *data)
{
void avl_delete(avl_tree_t *tree, void *data) {
avl_node_t *node;
node = avl_search_node(tree, data);
@ -652,8 +628,7 @@ void avl_delete(avl_tree_t *tree, void *data)
/* Fast tree cleanup */
void avl_delete_tree(avl_tree_t *tree)
{
void avl_delete_tree(avl_tree_t *tree) {
avl_node_t *node, *next;
for(node = tree->head; node; node = next) {
@ -666,8 +641,7 @@ void avl_delete_tree(avl_tree_t *tree)
/* Tree walking */
void avl_foreach(const avl_tree_t *tree, avl_action_t action)
{
void avl_foreach(const avl_tree_t *tree, avl_action_t action) {
avl_node_t *node, *next;
for(node = tree->head; node; node = next) {
@ -676,8 +650,7 @@ void avl_foreach(const avl_tree_t *tree, avl_action_t action)
}
}
void avl_foreach_node(const avl_tree_t *tree, avl_action_t action)
{
void avl_foreach_node(const avl_tree_t *tree, avl_action_t action) {
avl_node_t *node, *next;
for(node = tree->head; node; node = next) {
@ -689,13 +662,11 @@ void avl_foreach_node(const avl_tree_t *tree, avl_action_t action)
/* Indexing */
#ifdef AVL_COUNT
unsigned int avl_count(const avl_tree_t *tree)
{
unsigned int avl_count(const avl_tree_t *tree) {
return AVL_NODE_COUNT(tree->root);
}
avl_node_t *avl_get_node(const avl_tree_t *tree, unsigned int index)
{
avl_node_t *avl_get_node(const avl_tree_t *tree, unsigned int index) {
avl_node_t *node;
unsigned int c;
@ -717,8 +688,7 @@ avl_node_t *avl_get_node(const avl_tree_t *tree, unsigned int index)
return NULL;
}
unsigned int avl_index(const avl_node_t *node)
{
unsigned int avl_index(const avl_node_t *node) {
avl_node_t *next;
unsigned int index;
@ -734,8 +704,7 @@ unsigned int avl_index(const avl_node_t *node)
}
#endif
#ifdef AVL_DEPTH
unsigned int avl_depth(const avl_tree_t *tree)
{
unsigned int avl_depth(const avl_tree_t *tree) {
return AVL_NODE_DEPTH(tree->root);
}
#endif

9
lib/dropin.c
View file

@ -38,8 +38,7 @@
Unless the argument noclose is non-zero, daemon() will redirect
standard input, standard output and standard error to /dev/null.
*/
int daemon(int nochdir, int noclose)
{
int daemon(int nochdir, int noclose) {
#ifdef HAVE_FORK
pid_t pid;
int fd;
@ -97,8 +96,7 @@ int daemon(int nochdir, int noclose)
current directory name. If the environment variable PWD is set, and
its value is correct, then that value will be returned.
*/
char *get_current_dir_name(void)
{
char *get_current_dir_name(void) {
size_t size;
char *buf;
char *r;
@ -125,8 +123,7 @@ char *get_current_dir_name(void)
#endif
#ifndef HAVE_ASPRINTF
int asprintf(char **buf, const char *fmt, ...)
{
int asprintf(char **buf, const char *fmt, ...) {
int status;
va_list ap;
int len;

12
lib/fake-getaddrinfo.c
View file

@ -17,8 +17,7 @@
#include "xalloc.h"
#ifndef HAVE_GAI_STRERROR
char *gai_strerror(int ecode)
{
char *gai_strerror(int ecode) {
switch (ecode) {
case EAI_NODATA:
return "No address associated with hostname";
@ -33,8 +32,7 @@ char *gai_strerror(int ecode)
#endif /* !HAVE_GAI_STRERROR */
#ifndef HAVE_FREEADDRINFO
void freeaddrinfo(struct addrinfo *ai)
{
void freeaddrinfo(struct addrinfo *ai) {
struct addrinfo *next;
while(ai) {
@ -46,8 +44,7 @@ void freeaddrinfo(struct addrinfo *ai)
#endif /* !HAVE_FREEADDRINFO */
#ifndef HAVE_GETADDRINFO
static struct addrinfo *malloc_ai(uint16_t port, uint32_t addr)
{
static struct addrinfo *malloc_ai(uint16_t port, uint32_t addr) {
struct addrinfo *ai;
ai = xmalloc_and_zero(sizeof(struct addrinfo) + sizeof(struct sockaddr_in));
@ -62,8 +59,7 @@ static struct addrinfo *malloc_ai(uint16_t port, uint32_t addr)
return ai;
}
int getaddrinfo(const char *hostname, const char *servname, const struct addrinfo *hints, struct addrinfo **res)
{
int getaddrinfo(const char *hostname, const char *servname, const struct addrinfo *hints, struct addrinfo **res) {
struct addrinfo *prev = NULL;
struct hostent *hp;
struct in_addr in = {0};

3
lib/fake-getnameinfo.c
View file

@ -16,8 +16,7 @@
#ifndef HAVE_GETNAMEINFO
int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags)
{
int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags) {
struct sockaddr_in *sin = (struct sockaddr_in *)sa;
struct hostent *hp;
int len;

45
lib/list.c
View file

@ -27,8 +27,7 @@
/* (De)constructors */
list_t *list_alloc(list_action_t delete)
{
list_t *list_alloc(list_action_t delete) {
list_t *list;
list = xmalloc_and_zero(sizeof(list_t));
@ -37,18 +36,15 @@ list_t *list_alloc(list_action_t delete)
return list;
}
void list_free(list_t *list)
{
void list_free(list_t *list) {
free(list);
}
list_node_t *list_alloc_node(void)
{
list_node_t *list_alloc_node(void) {
return xmalloc_and_zero(sizeof(list_node_t));
}
void list_free_node(list_t *list, list_node_t *node)
{
void list_free_node(list_t *list, list_node_t *node) {
if(node->data && list->delete)
list->delete(node->data);
@ -57,8 +53,7 @@ void list_free_node(list_t *list, list_node_t *node)
/* Insertion and deletion */
list_node_t *list_insert_head(list_t *list, void *data)
{
list_node_t *list_insert_head(list_t *list, void *data) {
list_node_t *node;
node = list_alloc_node();
@ -78,8 +73,7 @@ list_node_t *list_insert_head(list_t *list, void *data)
return node;
}
list_node_t *list_insert_tail(list_t *list, void *data)
{
list_node_t *list_insert_tail(list_t *list, void *data) {
list_node_t *node;
node = list_alloc_node();
@ -99,8 +93,7 @@ list_node_t *list_insert_tail(list_t *list, void *data)
return node;
}
void list_unlink_node(list_t *list, list_node_t *node)
{
void list_unlink_node(list_t *list, list_node_t *node) {
if(node->prev)
node->prev->next = node->next;
else
@ -114,34 +107,29 @@ void list_unlink_node(list_t *list, list_node_t *node)
list->count--;
}
void list_delete_node(list_t *list, list_node_t *node)
{
void list_delete_node(list_t *list, list_node_t *node) {
list_unlink_node(list, node);
list_free_node(list, node);
}
void list_delete_head(list_t *list)
{
void list_delete_head(list_t *list) {
list_delete_node(list, list->head);
}
void list_delete_tail(list_t *list)
{
void list_delete_tail(list_t *list) {
list_delete_node(list, list->tail);
}
/* Head/tail lookup */
void *list_get_head(list_t *list)
{
void *list_get_head(list_t *list) {
if(list->head)
return list->head->data;
else
return NULL;
}
void *list_get_tail(list_t *list)
{
void *list_get_tail(list_t *list) {
if(list->tail)
return list->tail->data;
else
@ -150,8 +138,7 @@ void *list_get_tail(list_t *list)
/* Fast list deletion */
void list_delete_list(list_t *list)
{
void list_delete_list(list_t *list) {
list_node_t *node, *next;
for(node = list->head; node; node = next) {
@ -164,8 +151,7 @@ void list_delete_list(list_t *list)
/* Traversing */
void list_foreach_node(list_t *list, list_action_node_t action)
{
void list_foreach_node(list_t *list, list_action_node_t action) {
list_node_t *node, *next;
for(node = list->head; node; node = next) {
@ -174,8 +160,7 @@ void list_foreach_node(list_t *list, list_action_node_t action)
}
}
void list_foreach(list_t *list, list_action_t action)
{
void list_foreach(list_t *list, list_action_t action) {
list_node_t *node, *next;
for(node = list->head; node; node = next) {

12
lib/pidfile.c
View file

@ -34,8 +34,7 @@
* 0 is returned if either there's no pidfile, it's empty
* or no pid can be read.
*/
pid_t read_pid (char *pidfile)
{
pid_t read_pid (char *pidfile) {
FILE *f;
long pid;
@ -52,8 +51,7 @@ pid_t read_pid (char *pidfile)
* table (using /proc) to determine if the process already exists. If
* so the pid is returned, otherwise 0.
*/
pid_t check_pid (char *pidfile)
{
pid_t check_pid (char *pidfile) {
pid_t pid = read_pid(pidfile);
/* Amazing ! _I_ am already holding the pid file... */
@ -78,8 +76,7 @@ pid_t check_pid (char *pidfile)
* Writes the pid to the specified file. If that fails 0 is
* returned, otherwise the pid.
*/
pid_t write_pid (char *pidfile)
{
pid_t write_pid (char *pidfile) {
FILE *f;
int fd;
pid_t pid;
@ -123,8 +120,7 @@ pid_t write_pid (char *pidfile)
* Remove the the specified file. The result from unlink(2)
* is returned
*/
int remove_pid (char *pidfile)
{
int remove_pid (char *pidfile) {
return unlink (pidfile);
}
#endif

12
lib/utils.c
View file

@ -31,8 +31,7 @@ volatile int cp_index = 0;
char *hexadecimals = "0123456789ABCDEF";
int charhex2bin(char c)
{
int charhex2bin(char c) {
if(isdigit(c))
return c - '0';
else
@ -40,15 +39,13 @@ int charhex2bin(char c)
}
void hex2bin(char *src, char *dst, int length)
{
void hex2bin(char *src, char *dst, int length) {
int i;
for(i = 0; i < length; i++)
dst[i] = charhex2bin(src[i * 2]) * 16 + charhex2bin(src[i * 2 + 1]);
}
void bin2hex(char *src, char *dst, int length)
{
void bin2hex(char *src, char *dst, int length) {
int i;
for(i = length - 1; i >= 0; i--) {
dst[i * 2 + 1] = hexadecimals[(unsigned char) src[i] & 15];
@ -57,8 +54,7 @@ void bin2hex(char *src, char *dst, int length)
}
#ifdef ENABLE_TRACING
void cp_trace()
{
void cp_trace() {
logger(LOG_DEBUG, "Checkpoint trace: %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d...",
cp_file[(cp_index + 15) % 16], cp_line[(cp_index + 15) % 16],
cp_file[(cp_index + 14) % 16], cp_line[(cp_index + 14) % 16],