Cleanup

* src/tbf.c: Use %zu to log size_t values; remove unused variables
and functions.

1 files changed, 10 insertions, 10 deletions

diff --git a/src/tbf.c b/src/tbf.c
index a1b6f9f..1695960 100644
--- a/src/tbf.c
+++ b/src/tbf.c
@@ -494,20 +494,22 @@ key_to_str(uint8_t key[], char *buf)
                 *buf++ = xdig[key[i] >> 4];
                 *buf++ = xdig[key[i] & 0xf];
         }
         *buf = 0;
 }
 
+#if 0
 static void
 node_to_keystr(struct node *node, char *buf)
 {
         if (node)
                 key_to_str(node->key, buf);
         else
                 *buf = 0;
 }
+#endif
 
 static void
 node_dump_ord(struct node *node, FILE *fp)
 {
         uint32_t *p;
                   
@@ -556,13 +558,12 @@ node_dump(struct node *node, FILE *fp)
 }
 
 static void
 tree_dump_unlocked(struct tree *tree, char const *file)
 {
         struct node *node;
-        char keybuf[3][2*SHA256_LEN+1];
         FILE *fp;
         int err = 0;
         struct dump_header header;
 
         fp = fopen(file, "w");
         if (!fp) {
@@ -653,13 +654,12 @@ new_node(struct node **nodes, struct dump_header *hdr,
 
 int
 tree_load_nodes(struct tree *tree, struct dump_header *hdr,
                 struct node **nodes, FILE *fp)
 {
         size_t i;
-        uint32_t root_idx;
         uint32_t ord[2];
         size_t incomplete = 0;
         
         for (i = 0; i < hdr->count; i++) {
                 struct node node, *np;
                 uint32_t len;
@@ -760,25 +760,25 @@ tree_load_nodes(struct tree *tree, struct dump_header *hdr,
                         }
                 }
                 lru_link_node(tree, np, tree->tail);
         }
         
         if (incomplete) {
-                syslog(LOG_DAEMON|LOG_ERR, "tbf.%s: %lu incomplete nodes left",
+                syslog(LOG_DAEMON|LOG_ERR, "tbf.%s: %zu incomplete nodes left",
                        __FUNCTION__, incomplete);
                 return 1;
         }
         tree->root = nodes[hdr->root];
         return 0;
 }
 
 struct tree *
 tree_load(char const *filename)
 {
         FILE *fp;
-        struct tree *tree;
+        struct tree *tree = NULL;
         int rc;
         struct dump_header header;
         
         fp = fopen(filename, "r");
         if (!fp) {
                 syslog(LOG_DAEMON|LOG_ERR, "can't open file %s: %s",
@@ -1016,18 +1016,18 @@ static void
 log_node(struct node *node, void *data)
 {
         struct traverse_closure *tc = data;
         char kbuf[2*SHA256_LEN+1];
         key_to_str(node->key, kbuf);
 #ifdef DEBUG
-        syslog(tc->prio, "%d: %p(%p,%p): %lu %s: %s", tc->num, node,
+        syslog(tc->prio, "%d: %p(%p,%p): %zu %s: %s", tc->num, node,
                node->child[CHILD_LEFT], node->child[CHILD_RIGHT], node->ord,
                kbuf,
                node->keystr);
 #else
-        syslog(tc->prio, "%d: %p(%p,%p): %lu %s", tc->num, node,
+        syslog(tc->prio, "%d: %p(%p,%p): %zu %s", tc->num, node,
                node->child[CHILD_LEFT], node->child[CHILD_RIGHT], node->ord,
                kbuf);
 #endif
 }
         
 
@@ -1048,12 +1048,12 @@ VCL_VOID
 vmod_log_stats(VRT_CTX, VCL_INT prio)
 {
         struct tree_stats st;
         struct tree *tree = tbf_get_tree();
         tree_compute_stats(tree, &st);
         tbf_release_tree(&tree);
-        syslog(prio, "Number of nodes: %lu", st.num_nodes);
-        syslog(prio, "Number of leaves: %lu", st.num_leaves);
-        syslog(prio, "Shortest path: %lu", st.shortest_path);
-        syslog(prio, "Longest path: %lu", st.longest_path);     
+        syslog(prio, "Number of nodes: %zu", st.num_nodes);
+        syslog(prio, "Number of leaves: %zu", st.num_leaves);
+        syslog(prio, "Shortest path: %zu", st.shortest_path);
+        syslog(prio, "Longest path: %zu", st.longest_path);     
         syslog(prio, "Avg path: %f", st.avg_path);
 }