Fix some compiler warnings.

diff --git a/src/buffer.c b/src/buffer.c
index 72888b508e405d5d4774844e2b3663ec0f2f76f3..249e3e0f1c9634e08efccdce2a4e28178cf15a45 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -58,7 +58,7 @@ char *buffer_prepare(buffer_t *buffer, int size) {
 
 // Copy data into the buffer.
                        
-char *buffer_add(buffer_t *buffer, const char *data, int size) {
+void buffer_add(buffer_t *buffer, const char *data, int size) {
        memcpy(buffer_prepare(buffer, size), data, size);
 }
 

diff --git a/src/buffer.h b/src/buffer.h
index db22ac4fc2f1b24b0437f43d29f6d3b384873505..73c1f69e407493112f8a445dc2802d20782638be 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -10,7 +10,7 @@ typedef struct buffer_t {
 
 extern void buffer_compact(buffer_t *buffer);
 extern char *buffer_prepare(buffer_t *buffer, int size);
-extern char *buffer_add(buffer_t *buffer, const char *data, int size);
+extern void buffer_add(buffer_t *buffer, const char *data, int size);
 extern char *buffer_readline(buffer_t *buffer);
 extern char *buffer_read(buffer_t *buffer, int size);
 extern void buffer_clear(buffer_t *buffer);

diff --git a/src/meta.c b/src/meta.c
index 1fbd22c29c26e90ccc11a85337598d6413c5f4f3..ac937750b5933b90db4230a542a36cd477d9ab3d 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -72,7 +72,7 @@ void broadcast_meta(connection_t *from, const char *buffer, int length) {
 }
 
 bool receive_meta(connection_t *c) {
-       int inlen, reqlen;
+       int inlen;
        char inbuf[MAXBUFSIZE];
        char *bufp = inbuf, *endp;
 

diff --git a/src/node.h b/src/node.h
index 38e0e0642d0cde3e853091079dfd6cd7738ffec7..9164085c2796b2fb92a583febbcd3aca014aaaba 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -97,6 +97,7 @@ extern void node_del(node_t *);
 extern node_t *lookup_node(char *);
 extern node_t *lookup_node_udp(const sockaddr_t *);
 extern bool dump_nodes(struct connection_t *);
+extern bool dump_traffic(struct connection_t *);
 extern void update_node_udp(node_t *, const sockaddr_t *);
 
 #endif                                                 /* __TINC_NODE_H__ */

diff --git a/src/tincctl.c b/src/tincctl.c
index 489d10cd0e32dab518dc4085ab19c0a97d983701..641fb9c4edd9de90e6f0af9ff8537ab5b4274305 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -522,7 +522,6 @@ int main(int argc, char *argv[], char *envp[]) {
                }
 
                bool do_graph = false;
-               int dumps = 1;
 
                if(!strcasecmp(argv[optind+1], "nodes"))
                        sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
@@ -536,7 +535,6 @@ int main(int argc, char *argv[], char *envp[]) {
                        sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
                        sendline(fd, "%d %d", CONTROL, REQ_DUMP_EDGES);
                        do_graph = true;
-                       dumps = 2;
                        printf("digraph {\n");
                } else {
                        fprintf(stderr, "Unknown dump type '%s'.\n", argv[optind+1]);