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

Fix compiler warnings.

Browse source
This commit is contained in:
Guus Sliepen 2002-09-10 09:40:25 +00:00
parent 3bc5543475
commit 161f917dd0
5 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
lib/avl_tree.c
View file

@ -29,7 +29,7 @@
library for inclusion into tinc (http://tinc.nl.linux.org/) by library for inclusion into tinc (http://tinc.nl.linux.org/) by
Guus Sliepen <guus@sliepen.eu.org>. 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> #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, void avl_insert_before(avl_tree_t *tree, avl_node_t *before,
avl_node_t *node) avl_node_t *node)
{ {
if(!before) if(!before) {
return tree->tail ? avl_insert_after(tree, tree->tail, node) : avl_insert_top(tree, node); if(tree->tail)
avl_insert_after(tree, tree->tail, node);
else
avl_insert_top(tree, node);
return;
}
node->next = before; node->next = before;
node->parent = before; node->parent = before;
node->prev = before->prev; node->prev = before->prev;
if(before->left) if(before->left) {
return avl_insert_after(tree, before->prev, node); avl_insert_after(tree, before->prev, node);
return;
}
if(before->prev) if(before->prev)
before->prev->next = node; 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) void avl_insert_after(avl_tree_t *tree, avl_node_t *after, avl_node_t *node)
{ {
if(!after) if(!after) {
return tree->head ? avl_insert_before(tree, tree->head, if(tree->head)
node) : avl_insert_top(tree, avl_insert_before(tree, tree->head, node);
node); else
avl_insert_top(tree, node);
return;
}
if(after->right) if(after->right) {
return avl_insert_before(tree, after->next, node); avl_insert_before(tree, after->next, node);
return;
}
node->prev = after; node->prev = after;
node->parent = after; node->parent = after;

1
lib/pidfile.c
View file

@ -33,6 +33,7 @@
#include <errno.h> #include <errno.h>
#include <signal.h> #include <signal.h>
#include <sys/types.h> #include <sys/types.h>
#include <signal.h>
#include <fcntl.h> #include <fcntl.h>
/* read_pid /* read_pid

5
src/graph.c
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: 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: /* We need to generate two trees from the graph:
@ -264,13 +264,14 @@ void sssp_bfs(void)
if(n->status.visited != n->status.reachable) { if(n->status.visited != n->status.reachable) {
n->status.reachable = !n->status.reachable; n->status.reachable = !n->status.reachable;
if(debug_lvl >= DEBUG_TRAFFIC) if(debug_lvl >= DEBUG_TRAFFIC) {
if(n->status.reachable) if(n->status.reachable)
syslog(LOG_DEBUG, _("Node %s (%s) became reachable"), syslog(LOG_DEBUG, _("Node %s (%s) became reachable"),
n->name, n->hostname); n->name, n->hostname);
else else
syslog(LOG_DEBUG, _("Node %s (%s) became unreachable"), syslog(LOG_DEBUG, _("Node %s (%s) became unreachable"),
n->name, n->hostname); n->name, n->hostname);
}
n->status.validkey = 0; n->status.validkey = 0;
n->status.waitingforkey = 0; n->status.waitingforkey = 0;

8
src/meta.c
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: 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" #include "config.h"
@ -84,7 +84,8 @@ void broadcast_meta(connection_t *from, char *buffer, int length)
int receive_meta(connection_t *c) int receive_meta(connection_t *c)
{ {
int x, l = sizeof(x); int x;
socklen_t l = sizeof(x);
int oldlen, i; int oldlen, i;
int lenin, reqlen; int lenin, reqlen;
int decrypted = 0; int decrypted = 0;
@ -136,8 +137,7 @@ int receive_meta(connection_t *c)
/* Decrypt */ /* Decrypt */
if(c->status.decryptin && !decrypted) { if(c->status.decryptin && !decrypted) {
EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen, EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen, lenin);
lenin);
memcpy(c->buffer + oldlen, inbuf, lenin); memcpy(c->buffer + oldlen, inbuf, lenin);
decrypted = 1; decrypted = 1;
} }

4
src/process.c
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.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" #include "config.h"
@ -220,8 +220,6 @@ void _execute_script(const char *scriptname, char **envp)
__attribute__ ((noreturn)); __attribute__ ((noreturn));
void _execute_script(const char *scriptname, char **envp) void _execute_script(const char *scriptname, char **envp)
{ {
char *s;
cp(); cp();
while(*envp) while(*envp)