- Fixed all (except 2) compiler warnings gcc -Wall gave.

This commit is contained in:
Guus Sliepen 2000-11-22 22:18:03 +00:00
parent 6f373e6902
commit dac256505e
5 changed files with 20 additions and 21 deletions

View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: list.c,v 1.1.2.4 2000/11/22 22:05:36 guus Exp $ $Id: list.c,v 1.1.2.5 2000/11/22 22:18:03 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -49,14 +49,10 @@ list_t *list_new(void)
Delete the element pointed to by idx from the list. Delete the element pointed to by idx from the list.
*/ */
list_node_t *list_delete(list_t *list, list_node_t *idx) void list_delete(list_t *list, list_node_t *idx)
{ {
list_node_t *res; if(!list || !idx)
return;
if(!list)
return NULL;
if(!idx)
return NULL;
if(list->callbacks->delete != NULL) if(list->callbacks->delete != NULL)
if(list->callbacks->delete(idx->data)) if(list->callbacks->delete(idx->data))
@ -67,13 +63,11 @@ list_node_t *list_delete(list_t *list, list_node_t *idx)
if(idx->prev == NULL) if(idx->prev == NULL)
/* First element in list */ /* First element in list */
{ {
res = idx->next;
list->head = idx->next; list->head = idx->next;
} }
if(idx->next == NULL) if(idx->next == NULL)
/* Last element in list */ /* Last element in list */
{ {
res = NULL;
list->tail = idx->prev; list->tail = idx->prev;
} }
if(idx->prev != NULL && idx->next != NULL) if(idx->prev != NULL && idx->next != NULL)
@ -87,8 +81,8 @@ list_node_t *list_delete(list_t *list, list_node_t *idx)
else else
if(list->tail == NULL) if(list->tail == NULL)
list->head = NULL; list->head = NULL;
free(idx); free(idx);
return res;
} }
/* /*
@ -99,7 +93,7 @@ list_node_t *list_delete(list_t *list, list_node_t *idx)
*/ */
void list_forall_nodes(list_t *list, int (*function)(void *data)) void list_forall_nodes(list_t *list, int (*function)(void *data))
{ {
list_node_t *p; list_node_t *p, *next;
int res; int res;
if(!list) /* no list given */ if(!list) /* no list given */
@ -108,11 +102,12 @@ void list_forall_nodes(list_t *list, int (*function)(void *data))
return; return;
if(!list->head) /* list is empty */ if(!list->head) /* list is empty */
return; return;
for(p = list->head; p != NULL; p = p->next) for(p = list->head; p != NULL; p = next)
{ {
next = p->next;
res = function(p->data); res = function(p->data);
if(res != 0) if(res != 0)
p = list_delete(list, p); list_delete(list, p);
} }
} }

View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: connection.c,v 1.1.2.4 2000/11/22 18:54:07 guus Exp $ $Id: connection.c,v 1.1.2.5 2000/11/22 22:18:03 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -160,7 +160,7 @@ cp
connection_t *lookup_connection(ipv4_t address, short unsigned int port) connection_t *lookup_connection(ipv4_t address, short unsigned int port)
{ {
connection_t cl, *p; connection_t cl;
cp cp
cl.address = address; cl.address = address;
cl.port = port; cl.port = port;

View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: connection.h,v 1.1.2.2 2000/11/20 22:13:03 guus Exp $ $Id: connection.h,v 1.1.2.3 2000/11/22 22:18:03 guus Exp $
*/ */
#ifndef __TINC_CONNECTION_H__ #ifndef __TINC_CONNECTION_H__
@ -111,9 +111,11 @@ extern connection_t *myself;
extern void init_connections(void); extern void init_connections(void);
extern connection_t *new_connection(void); extern connection_t *new_connection(void);
extern void free_connection(connection_t *); extern void free_connection(connection_t *);
extern void id_add(connection_t *);
extern void connection_add(connection_t *); extern void connection_add(connection_t *);
extern void connection_del(connection_t *); extern void connection_del(connection_t *);
extern connection_t *lookup_id(char *); extern connection_t *lookup_id(char *);
extern connection_t *lookup_connection(ipv4_t, short unsigned int);
extern void dump_connection_list(void); extern void dump_connection_list(void);
extern int read_host_config(connection_t *); extern int read_host_config(connection_t *);
extern void destroy_connection_tree(void); extern void destroy_connection_tree(void);

View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: process.c,v 1.1.2.11 2000/11/22 22:05:37 guus Exp $ $Id: process.c,v 1.1.2.12 2000/11/22 22:18:03 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -42,6 +42,8 @@
#include "conf.h" #include "conf.h"
#include "process.h" #include "process.h"
#include "subnet.h"
#include "connection.h"
#include "system.h" #include "system.h"
@ -199,8 +201,6 @@ cp
*/ */
int detach(void) int detach(void)
{ {
int fd;
pid_t pid;
cp cp
setup_signals(); setup_signals();

View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: process.h,v 1.1.2.3 2000/11/20 22:13:13 guus Exp $ $Id: process.h,v 1.1.2.4 2000/11/22 22:18:03 guus Exp $
*/ */
#ifndef __TINC_PROCESS_H__ #ifndef __TINC_PROCESS_H__
@ -34,5 +34,7 @@ extern void setup_signals(void);
extern int execute_script(const char *); extern int execute_script(const char *);
extern void check_children(void); extern void check_children(void);
extern int detach(void); extern int detach(void);
extern int kill_other(void);
extern void cleanup_and_exit(int);
#endif /* __TINC_PROCESS_H__ */ #endif /* __TINC_PROCESS_H__ */