Fix compiler warnings.

diff --git a/lib/avl_tree.c b/lib/avl_tree.c
index 575b2f1248a8a42a19a71be9d9d2733ca1fbd1bd..d35936e6804043fef08481e5e1c3f3902f87904b 100644 (file)
--- a/lib/avl_tree.c
+++ b/lib/avl_tree.c
@@ -29,7 +29,7 @@
     library for inclusion into tinc (http://tinc.nl.linux.org/) by
     Guus Sliepen <guus@sliepen.eu.org>.
 
-    $Id: avl_tree.c,v 1.1.2.11 2002/09/09 22:32:24 guus Exp $
+    $Id: avl_tree.c,v 1.1.2.12 2002/09/10 09:40:15 guus Exp $
 */
 
 #include <stdio.h>
@@ -494,15 +494,22 @@ void avl_insert_top(avl_tree_t *tree, avl_node_t *node)
 void avl_insert_before(avl_tree_t *tree, avl_node_t *before,
                                           avl_node_t *node)
 {
-       if(!before)
-               return tree->tail ? avl_insert_after(tree, tree->tail, node) : avl_insert_top(tree, node);
+       if(!before) {
+               if(tree->tail)
+                       avl_insert_after(tree, tree->tail, node);
+               else
+                       avl_insert_top(tree, node);
+               return;
+       }
 
        node->next = before;
        node->parent = before;
        node->prev = before->prev;
 
-       if(before->left)
-               return avl_insert_after(tree, before->prev, node);
+       if(before->left) {
+               avl_insert_after(tree, before->prev, node);
+               return;
+       }
 
        if(before->prev)
                before->prev->next = node;
@@ -517,13 +524,18 @@ void avl_insert_before(avl_tree_t *tree, avl_node_t *before,
 
 void avl_insert_after(avl_tree_t *tree, avl_node_t *after, avl_node_t *node)
 {
-       if(!after)
-               return tree->head ? avl_insert_before(tree, tree->head,
-                                                                                         node) : avl_insert_top(tree,
-                                                                                                                                        node);
+       if(!after) {
+               if(tree->head)
+                       avl_insert_before(tree, tree->head, node);
+               else
+                       avl_insert_top(tree, node);
+               return;
+       }
 
-       if(after->right)
-               return avl_insert_before(tree, after->next, node);
+       if(after->right) {
+               avl_insert_before(tree, after->next, node);
+               return;
+       }
 
        node->prev = after;
        node->parent = after;

diff --git a/lib/pidfile.c b/lib/pidfile.c
index a954d18f92851b8f9022ded10ce92733f18b907c..250f67b75ccf5b3c3d80023873dedb456670bdfb 100644 (file)
--- a/lib/pidfile.c
+++ b/lib/pidfile.c
@@ -33,6 +33,7 @@
 #include <errno.h>
 #include <signal.h>
 #include <sys/types.h>
+#include <signal.h>
 #include <fcntl.h>
 
 /* read_pid

diff --git a/src/graph.c b/src/graph.c
index d1bd2ac34c908a8f9c569f4e92189e5f798f5e38..feb9d00996be73e8a900b3bb330a65e75670898f 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: graph.c,v 1.1.2.19 2002/09/09 21:24:34 guus Exp $
+    $Id: graph.c,v 1.1.2.20 2002/09/10 09:40:21 guus Exp $
 */
 
 /* We need to generate two trees from the graph:
@@ -264,13 +264,14 @@ void sssp_bfs(void)
                if(n->status.visited != n->status.reachable) {
                        n->status.reachable = !n->status.reachable;
 
-                       if(debug_lvl >= DEBUG_TRAFFIC)
+                       if(debug_lvl >= DEBUG_TRAFFIC) {
                                if(n->status.reachable)
                                        syslog(LOG_DEBUG, _("Node %s (%s) became reachable"),
                                                   n->name, n->hostname);
                                else
                                        syslog(LOG_DEBUG, _("Node %s (%s) became unreachable"),
                                                   n->name, n->hostname);
+                       }
 
                        n->status.validkey = 0;
                        n->status.waitingforkey = 0;

diff --git a/src/meta.c b/src/meta.c
index bf6cc4ca7dedde9c17e002dc9276be166d66c802..0025dd83e01c23a88eaca1bd79173609c0bb3c3f 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: meta.c,v 1.1.2.30 2002/09/09 22:32:39 guus Exp $
+    $Id: meta.c,v 1.1.2.31 2002/09/10 09:40:25 guus Exp $
 */
 
 #include "config.h"
@@ -84,7 +84,8 @@ void broadcast_meta(connection_t *from, char *buffer, int length)
 
 int receive_meta(connection_t *c)
 {
-       int x, l = sizeof(x);
+       int x;
+       socklen_t l = sizeof(x);
        int oldlen, i;
        int lenin, reqlen;
        int decrypted = 0;
@@ -136,8 +137,7 @@ int receive_meta(connection_t *c)
                /* Decrypt */
 
                if(c->status.decryptin && !decrypted) {
-                       EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen,
-                                                         lenin);
+                       EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen, lenin);
                        memcpy(c->buffer + oldlen, inbuf, lenin);
                        decrypted = 1;
                }

diff --git a/src/process.c b/src/process.c
index 46a8de8d7543bf61d0ec44f5a98ed3bb37697cd4..a70d8d28e00d8f77195103e296d5db9ba8a537ee 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: process.c,v 1.1.2.47 2002/09/09 22:32:49 guus Exp $
+    $Id: process.c,v 1.1.2.48 2002/09/10 09:40:25 guus Exp $
 */
 
 #include "config.h"
@@ -220,8 +220,6 @@ void _execute_script(const char *scriptname, char **envp)
        __attribute__ ((noreturn));
 void _execute_script(const char *scriptname, char **envp)
 {
-       char *s;
-
        cp();
 
        while(*envp)