summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2016-02-09 12:41:23 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2016-02-09 14:47:19 (GMT)
commit02cf9eed46759e019b3aca83f691f1ee31be2db5 (patch) (unidiff)
treead8d082c3c4f7ea8c340f594bf220184b73d1a2f
parent777bd9688099daf5af9d0e41f2df668040e072a9 (diff)
downloadvmod-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/tbf.c20
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
@@ -497,6 +497,7 @@ key_to_str(uint8_t key[], char *buf)
497 *buf = 0; 497 *buf = 0;
498} 498}
499 499
500#if 0
500static void 501static void
501node_to_keystr(struct node *node, char *buf) 502node_to_keystr(struct node *node, char *buf)
502{ 503{
@@ -505,6 +506,7 @@ node_to_keystr(struct node *node, char *buf)
505 else 506 else
506 *buf = 0; 507 *buf = 0;
507} 508}
509#endif
508 510
509static void 511static void
510node_dump_ord(struct node *node, FILE *fp) 512node_dump_ord(struct node *node, FILE *fp)
@@ -559,7 +561,6 @@ static void
559tree_dump_unlocked(struct tree *tree, char const *file) 561tree_dump_unlocked(struct tree *tree, char const *file)
560{ 562{
561 struct node *node; 563 struct node *node;
562 char keybuf[3][2*SHA256_LEN+1];
563 FILE *fp; 564 FILE *fp;
564 int err = 0; 565 int err = 0;
565 struct dump_header header; 566 struct dump_header header;
@@ -656,7 +657,6 @@ tree_load_nodes(struct tree *tree, struct dump_header *hdr,
656 struct node **nodes, FILE *fp) 657 struct node **nodes, FILE *fp)
657{ 658{
658 size_t i; 659 size_t i;
659 uint32_t root_idx;
660 uint32_t ord[2]; 660 uint32_t ord[2];
661 size_t incomplete = 0; 661 size_t incomplete = 0;
662 662
@@ -763,7 +763,7 @@ tree_load_nodes(struct tree *tree, struct dump_header *hdr,
763 } 763 }
764 764
765 if (incomplete) { 765 if (incomplete) {
766 syslog(LOG_DAEMON|LOG_ERR, "tbf.%s: %lu incomplete nodes left", 766 syslog(LOG_DAEMON|LOG_ERR, "tbf.%s: %zu incomplete nodes left",
767 __FUNCTION__, incomplete); 767 __FUNCTION__, incomplete);
768 return 1; 768 return 1;
769 } 769 }
@@ -775,7 +775,7 @@ struct tree *
775tree_load(char const *filename) 775tree_load(char const *filename)
776{ 776{
777 FILE *fp; 777 FILE *fp;
778 struct tree *tree; 778 struct tree *tree = NULL;
779 int rc; 779 int rc;
780 struct dump_header header; 780 struct dump_header header;
781 781
@@ -1019,12 +1019,12 @@ log_node(struct node *node, void *data)
1019 char kbuf[2*SHA256_LEN+1]; 1019 char kbuf[2*SHA256_LEN+1];
1020 key_to_str(node->key, kbuf); 1020 key_to_str(node->key, kbuf);
1021#ifdef DEBUG 1021#ifdef DEBUG
1022 syslog(tc->prio, "%d: %p(%p,%p): %lu %s: %s", tc->num, node, 1022 syslog(tc->prio, "%d: %p(%p,%p): %zu %s: %s", tc->num, node,
1023 node->child[CHILD_LEFT], node->child[CHILD_RIGHT], node->ord, 1023 node->child[CHILD_LEFT], node->child[CHILD_RIGHT], node->ord,
1024 kbuf, 1024 kbuf,
1025 node->keystr); 1025 node->keystr);
1026#else 1026#else
1027 syslog(tc->prio, "%d: %p(%p,%p): %lu %s", tc->num, node, 1027 syslog(tc->prio, "%d: %p(%p,%p): %zu %s", tc->num, node,
1028 node->child[CHILD_LEFT], node->child[CHILD_RIGHT], node->ord, 1028 node->child[CHILD_LEFT], node->child[CHILD_RIGHT], node->ord,
1029 kbuf); 1029 kbuf);
1030#endif 1030#endif
@@ -1051,9 +1051,9 @@ vmod_log_stats(VRT_CTX, VCL_INT prio)
1051 struct tree *tree = tbf_get_tree(); 1051 struct tree *tree = tbf_get_tree();
1052 tree_compute_stats(tree, &st); 1052 tree_compute_stats(tree, &st);
1053 tbf_release_tree(&tree); 1053 tbf_release_tree(&tree);
1054 syslog(prio, "Number of nodes: %lu", st.num_nodes); 1054 syslog(prio, "Number of nodes: %zu", st.num_nodes);
1055 syslog(prio, "Number of leaves: %lu", st.num_leaves); 1055 syslog(prio, "Number of leaves: %zu", st.num_leaves);
1056 syslog(prio, "Shortest path: %lu", st.shortest_path); 1056 syslog(prio, "Shortest path: %zu", st.shortest_path);
1057 syslog(prio, "Longest path: %lu", st.longest_path); 1057 syslog(prio, "Longest path: %zu", st.longest_path);
1058 syslog(prio, "Avg path: %f", st.avg_path); 1058 syslog(prio, "Avg path: %f", st.avg_path);
1059} 1059}

Return to:

Send suggestions and report system problems to the System administrator.