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
@@ -499,2 +499,3 @@ key_to_str(uint8_t key[], char *buf)
 
+#if 0
 static void
@@ -507,2 +508,3 @@ node_to_keystr(struct node *node, char *buf)
 }
+#endif
 
@@ -561,3 +563,2 @@ tree_dump_unlocked(struct tree *tree, char const *file)
         struct node *node;
-        char keybuf[3][2*SHA256_LEN+1];
         FILE *fp;
@@ -658,3 +659,2 @@ tree_load_nodes(struct tree *tree, struct dump_header *hdr,
         size_t i;
-        uint32_t root_idx;
         uint32_t ord[2];
@@ -765,3 +765,3 @@ tree_load_nodes(struct tree *tree, struct dump_header *hdr,
         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);
@@ -777,3 +777,3 @@ tree_load(char const *filename)
         FILE *fp;
-        struct tree *tree;
+        struct tree *tree = NULL;
         int rc;
@@ -1021,3 +1021,3 @@ log_node(struct node *node, void *data)
 #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,
@@ -1026,3 +1026,3 @@ log_node(struct node *node, void *data)
 #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,
@@ -1053,6 +1053,6 @@ vmod_log_stats(VRT_CTX, VCL_INT prio)
         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);