1 files changed, 9 insertions, 23 deletions

diff --git a/ot_stats.c b/ot_stats.c
index 58ac4b8..d43f29c 100644
--- a/ot_stats.c
+++ b/ot_stats.c
@@ -4,13 +4,11 @@
  $id$ */
 
 /* System */
-#include <arpa/inet.h>
 #include <inttypes.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <unistd.h>
@@ -19,13 +17,13 @@
 #endif
 
 /* Libowfat */
-#include "byte.h"
 #include "io.h"
 #include "ip4.h"
 #include "ip6.h"
 
 /* Opentracker */
 #include "ot_accesslist.h"
+#include "ot_hex.h"
 #include "ot_iovec.h"
 #include "ot_mutex.h"
 #include "ot_stats.h"
@@ -298,18 +296,6 @@ static int torrent_statter(ot_torrent *torrent, uintptr_t data) {
 }
 
 /* Converter function from memory to human readable hex strings */
-static char *to_hex(char *d, uint8_t *s) {
-  char *m = "0123456789ABCDEF";
-  char *t = d;
-  char *e = d + 40;
-  while (d < e) {
-    *d++ = m[*s >> 4];
-    *d++ = m[*s++ & 15];
-  }
-  *d = 0;
-  return t;
-}
-
 typedef struct {
   size_t  val;
   ot_hash hash;
@@ -339,9 +325,9 @@ size_t stats_top_txt(char *reply, size_t amount) {
   if (amount > 100)
     amount = 100;
 
-  byte_zero(top100s, sizeof(top100s));
-  byte_zero(top100c, sizeof(top100c));
-  byte_zero(top100l, sizeof(top100l));
+  memset(top100s, 0, sizeof(top100s));
+  memset(top100c, 0, sizeof(top100c));
+  memset(top100l, 0, sizeof(top100l));
 
   /* Iterate over complete torrent list */
   for (bucket = 0; bucket < OT_BUCKET_COUNT; ++bucket) {
@@ -364,15 +350,15 @@ size_t stats_top_txt(char *reply, size_t amount) {
   r += sprintf(r, "Top %zd torrents by peers:\n", amount);
   for (idx = 0; idx < amount; ++idx)
     if (top100c[idx].val)
-      r += sprintf(r, "\t%zd\t%s\n", top100c[idx].val, to_hex(hex_out, top100c[idx].hash));
+      r += sprintf(r, "\t%zd\t%s\n", top100c[idx].val, hex_fromhash(hex_out, top100c[idx].hash));
   r += sprintf(r, "Top %zd torrents by seeds:\n", amount);
   for (idx = 0; idx < amount; ++idx)
     if (top100s[idx].val)
-      r += sprintf(r, "\t%zd\t%s\n", top100s[idx].val, to_hex(hex_out, top100s[idx].hash));
+      r += sprintf(r, "\t%zd\t%s\n", top100s[idx].val, hex_fromhash(hex_out, top100s[idx].hash));
   r += sprintf(r, "Top %zd torrents by leechers:\n", amount);
   for (idx = 0; idx < amount; ++idx)
     if (top100l[idx].val)
-      r += sprintf(r, "\t%zd\t%s\n", top100l[idx].val, to_hex(hex_out, top100l[idx].hash));
+      r += sprintf(r, "\t%zd\t%s\n", top100l[idx].val, hex_fromhash(hex_out, top100l[idx].hash));
 
   return r - reply;
 }
@@ -670,9 +656,9 @@ void stats_issue_event(ot_status_event event, PROTO_FLAG proto, uintptr_t event_
       localtime_r(&ttt, &time_now);
       strftime(timestring, sizeof(timestring), "%FT%T%z", &time_now);
 
-      to_hex(hash_hex, *ws->hash);
+      hex_fromhash(hash_hex, *ws->hash);
       if (ws->peer_id)
-        to_hex(peerid_hex, (uint8_t *)ws->peer_id);
+        hex_fromhash(peerid_hex, (uint8_t *)ws->peer_id);
       else {
         *peerid_hex = 0;
       }