diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2016-02-09 14:41:23 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2016-02-09 16:47:19 +0200 |
commit | 02cf9eed46759e019b3aca83f691f1ee31be2db5 (patch) | |
tree | ad8d082c3c4f7ea8c340f594bf220184b73d1a2f | |
parent | 777bd9688099daf5af9d0e41f2df668040e072a9 (diff) | |
download | vmod-tbf-02cf9eed46759e019b3aca83f691f1ee31be2db5.tar.gz vmod-tbf-02cf9eed46759e019b3aca83f691f1ee31be2db5.tar.bz2 |
Cleanup
* src/tbf.c: Use %zu to log size_t values; remove unused variables
and functions.
-rw-r--r-- | src/tbf.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -498,4 +498,5 @@ key_to_str(uint8_t key[], char *buf) } +#if 0 static void node_to_keystr(struct node *node, char *buf) @@ -506,4 +507,5 @@ node_to_keystr(struct node *node, char *buf) *buf = 0; } +#endif static void @@ -560,5 +562,4 @@ tree_dump_unlocked(struct tree *tree, char const *file) { struct node *node; - char keybuf[3][2*SHA256_LEN+1]; FILE *fp; int err = 0; @@ -657,5 +658,4 @@ tree_load_nodes(struct tree *tree, struct dump_header *hdr, { size_t i; - uint32_t root_idx; uint32_t ord[2]; size_t incomplete = 0; @@ -764,5 +764,5 @@ 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); return 1; @@ -776,5 +776,5 @@ tree_load(char const *filename) { FILE *fp; - struct tree *tree; + struct tree *tree = NULL; int rc; struct dump_header header; @@ -1020,10 +1020,10 @@ log_node(struct node *node, void *data) 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); @@ -1052,8 +1052,8 @@ vmod_log_stats(VRT_CTX, VCL_INT prio) 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); } |