projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure malloc() is declared.
[tinc]
/
src
/
edge.c
diff --git
a/src/edge.c
b/src/edge.c
index
8c10009
..
0a47f8c
100644
(file)
--- a/
src/edge.c
+++ b/
src/edge.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.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: edge.c,v 1.1.2.1
6 2002/09/09 21:24:31
guus Exp $
+ $Id: edge.c,v 1.1.2.1
8 2002/09/10 22:12:33
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-31,7
+31,6
@@
#include "net.h" /* Don't ask. */
#include "netutl.h"
#include "net.h" /* Don't ask. */
#include "netutl.h"
-#include "config.h"
#include "conf.h"
#include <utils.h>
#include "subnet.h"
#include "conf.h"
#include <utils.h>
#include "subnet.h"
@@
-43,12
+42,12
@@
avl_tree_t *edge_weight_tree; /* Tree with all edges, sorted on weight */
avl_tree_t *edge_weight_tree; /* Tree with all edges, sorted on weight */
-int edge_compare(edge_t *
a, edge_t *
b)
+int edge_compare(edge_t *
a, edge_t *
b)
{
return strcmp(a->to->name, b->to->name);
}
{
return strcmp(a->to->name, b->to->name);
}
-int edge_weight_compare(edge_t *
a, edge_t *
b)
+int edge_weight_compare(edge_t *
a, edge_t *
b)
{
int result;
{
int result;
@@
-80,7
+79,7
@@
avl_tree_t *new_edge_tree(void)
return avl_alloc_tree((avl_compare_t) edge_compare, NULL);
}
return avl_alloc_tree((avl_compare_t) edge_compare, NULL);
}
-void free_edge_tree(avl_tree_t *
edge_tree)
+void free_edge_tree(avl_tree_t *edge_tree)
{
cp();
{
cp();
@@
-103,14
+102,14
@@
edge_t *new_edge(void)
return (edge_t *) xmalloc_and_zero(sizeof(edge_t));
}
return (edge_t *) xmalloc_and_zero(sizeof(edge_t));
}
-void free_edge(edge_t *
e)
+void free_edge(edge_t *e)
{
cp();
free(e);
}
{
cp();
free(e);
}
-void edge_add(edge_t *
e)
+void edge_add(edge_t *e)
{
cp();
{
cp();
@@
-123,7
+122,7
@@
void edge_add(edge_t * e)
e->reverse->reverse = e;
}
e->reverse->reverse = e;
}
-void edge_del(edge_t *
e)
+void edge_del(edge_t *e)
{
cp();
{
cp();
@@
-134,7
+133,7
@@
void edge_del(edge_t * e)
avl_delete(edge_weight_tree, e);
}
avl_delete(edge_weight_tree, e);
}
-edge_t *lookup_edge(node_t *
from, node_t *
to)
+edge_t *lookup_edge(node_t *
from, node_t *
to)
{
edge_t v;
{
edge_t v;