1 files changed, 7 insertions, 7 deletions

diff --git a/ot_fullscrape.c b/ot_fullscrape.c
index eade79d..0dee5c2 100644
--- a/ot_fullscrape.c
+++ b/ot_fullscrape.c
@@ -25,7 +25,7 @@
 #include "ot_fullscrape.h"
 #include "ot_iovec.h"
 #include "ot_mutex.h"
-#include "scan_urlencoded_query.h"
+#include "ot_urlencoded.h"
 #include "trackerlogic.h"
 
 /* Fetch full scrape info for all torrents
@@ -105,12 +105,12 @@ static char * fullscrape_write_one( ot_tasktype mode, char *r, ot_torrent *torre
 
     break;
   case TASK_FULLSCRAPE_TPB_ASCII:
-    hex_fromhash(r, *hash);
+    hex_from_hash(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:
-    hex_fromhash(r, *hash);
+    hex_from_hash(r, *hash);
     r += 2 * sizeof(ot_hash);
     r += sprintf(r, ":%zd:%zd:%zd\n", seed_count, peer_count - seed_count, down_count);
     break;
@@ -122,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, *hash, sizeof(ot_hash));
+    r += urlencoded_format(r, *hash, sizeof(ot_hash));
     r += sprintf(r, ":%zd:%zd\n", seed_count, peer_count - seed_count);
     break;
   case TASK_FULLSCRAPE_TRACKERSTATE:
-    hex_fromhash(r, *hash);
+    hex_from_hash(r, *hash);
     r += 2 * sizeof(ot_hash);
     r += sprintf(r, ":%zd:%zd\n", torrent->peer_list6->base, down_count);
     break;
@@ -296,7 +296,7 @@ static void fullscrape_make_gzip(int taskid, ot_tasktype mode) {
       iovector.iov_base = malloc(OT_SCRAPE_CHUNK_SIZE);
 
       if (!iovector.iov_base) {
-        fprintf(stderr, "Problem with iovec_fix_increase_or_free\n");
+        fprintf(stderr, "Problem with iovec_next_chunk\n");
         deflateEnd(&strm);
         return;
       }
@@ -422,7 +422,7 @@ static void fullscrape_make_zstd(int taskid, ot_tasktype mode) {
       iovector.iov_base = malloc(OT_SCRAPE_CHUNK_SIZE);
 
       if (!iovector.iov_base) {
-        fprintf(stderr, "Problem with iovec_fix_increase_or_free\n");
+        fprintf(stderr, "Problem with iovec_next_chunk\n");
         ZSTD_freeCCtx(zstream);
         return;
       }