1 files changed, 17 insertions, 26 deletions

diff --git a/ot_fullscrape.c b/ot_fullscrape.c
index b800431..3d0e2f1 100644
--- a/ot_fullscrape.c
+++ b/ot_fullscrape.c
@@ -10,7 +10,6 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/param.h>
 #ifdef WANT_COMPRESSION_GZIP
 #include <zlib.h>
 #endif
@@ -18,16 +17,15 @@
 #include <zstd.h>
 #endif
 
-
 /* Libowfat */
-#include "byte.h"
 #include "io.h"
-#include "textcode.h"
 
 /* Opentracker */
+#include "ot_hex.h"
 #include "ot_fullscrape.h"
 #include "ot_iovec.h"
 #include "ot_mutex.h"
+#include "scan_urlencoded_query.h"
 #include "trackerlogic.h"
 
 /* Fetch full scrape info for all torrents
@@ -50,18 +48,6 @@ static void fullscrape_make_zstd(int taskid, ot_tasktype mode);
 
 /* Converter function from memory to human readable hex strings
    XXX - Duplicated from ot_stats. Needs fix. */
-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;
-}
-
 /* This is the entry point into this worker thread
    It grabs tasks from mutex_tasklist and delivers results back
 */
@@ -119,12 +105,12 @@ static char * fullscrape_write_one( ot_tasktype mode, char *r, ot_torrent *torre
 
     break;
   case TASK_FULLSCRAPE_TPB_ASCII:
-    to_hex(r, *hash);
+    hex_fromhash(r, *hash);
     r += 2 * sizeof(ot_hash);
     r += sprintf(r, ":%zd:%zd\n", seed_count, peer_count - seed_count);
     break;
   case TASK_FULLSCRAPE_TPB_ASCII_PLUS:
-    to_hex(r, *hash);
+    hex_fromhash(r, *hash);
     r += 2 * sizeof(ot_hash);
     r += sprintf(r, ":%zd:%zd:%zd\n", seed_count, peer_count - seed_count, down_count);
     break;
@@ -136,11 +122,11 @@ static char * fullscrape_write_one( ot_tasktype mode, char *r, ot_torrent *torre
     r                    += 8;
     break;
   case TASK_FULLSCRAPE_TPB_URLENCODED:
-    r += fmt_urlencoded(r, (char *)*hash, 20);
+    r += fmt_urlencoded(r, *hash, sizeof(ot_hash));
     r += sprintf(r, ":%zd:%zd\n", seed_count, peer_count - seed_count);
     break;
   case TASK_FULLSCRAPE_TRACKERSTATE:
-    to_hex(r, *hash);
+    hex_fromhash(r, *hash);
     r += 2 * sizeof(ot_hash);
     r += sprintf(r, ":%zd:%zd\n", torrent->peer_list6->base, down_count);
     break;
@@ -180,12 +166,15 @@ static void fullscrape_make(int taskid, ot_tasktype mode) {
 
         if (mutex_workqueue_pushchunked(taskid, &iovector)) {
           free(iovector.iov_base);
-          return mutex_bucket_unlock(bucket, 0);
+          mutex_bucket_unlock(bucket, 0);
+          return;
         }
         /* Allocate a fresh output buffer */
         r = iovector.iov_base = malloc(OT_SCRAPE_CHUNK_SIZE);
-        if (!r)
-          return mutex_bucket_unlock(bucket, 0);
+        if (!r) {
+          mutex_bucket_unlock(bucket, 0);
+          return;
+        }
 
         /* re points to low watermark */
         re = r + OT_SCRAPE_CHUNK_SIZE - OT_SCRAPE_MAXENTRYLEN;
@@ -222,7 +211,7 @@ static void fullscrape_make_gzip(int taskid, ot_tasktype mode) {
   if (!iovector.iov_base)
     return;
 
-  byte_zero(&strm, sizeof(strm));
+  memset(&strm, 0, sizeof(strm));
   strm.next_out  = (uint8_t *)iovector.iov_base;
   strm.avail_out = OT_SCRAPE_CHUNK_SIZE;
   if (deflateInit2(&strm, 7, Z_DEFLATED, 31, 9, Z_DEFAULT_STRATEGY) != Z_OK)
@@ -257,14 +246,16 @@ static void fullscrape_make_gzip(int taskid, ot_tasktype mode) {
 
         if (mutex_workqueue_pushchunked(taskid, &iovector)) {
           free(iovector.iov_base);
-          return mutex_bucket_unlock(bucket, 0);
+          mutex_bucket_unlock(bucket, 0);
+          return;
         }
         /* Allocate a fresh output buffer */
         iovector.iov_base = malloc(OT_SCRAPE_CHUNK_SIZE);
         if (!iovector.iov_base) {
           fprintf(stderr, "Out of memory trying to claim ouput buffer\n");
           deflateEnd(&strm);
-          return mutex_bucket_unlock(bucket, 0);
+          mutex_bucket_unlock(bucket, 0);
+          return;
         }
         strm.next_out  = (uint8_t *)iovector.iov_base;
         strm.avail_out = OT_SCRAPE_CHUNK_SIZE;