1 files changed, 9 insertions, 15 deletions

diff --git a/ot_sync.c b/ot_sync.c
index dc71ddd..f656bef 100644
--- a/ot_sync.c
+++ b/ot_sync.c
@@ -10,10 +10,8 @@
 #include <sys/types.h>
 #include <sys/uio.h>
 
-/* Libowfat */
-#include "io.h"
-
 /* Opentracker */
+#include "ot_fmt.h"
 #include "ot_iovec.h"
 #include "ot_mutex.h"
 #include "ot_scan.h"
@@ -51,7 +49,7 @@ int add_changeset_to_tracker(uint8_t *data, size_t len) {
     data += sizeof(ot_hash);
 
     /* Scan string length indicator, strictly: bencode writes no leading zeros */
-    data += (len = scan_udec_bencode((char *)data, &peer_count, (uint64_t)(end - data)));
+    data += (len = scan_uint_bencode((char *)data, &peer_count, (uint64_t)(end - data)));
 
     /* If no long was scanned, it is not divisible by 8, it is not
        followed by a colon or claims to need to much memory, we fail */
@@ -77,7 +75,7 @@ static void sync_make(size_t *iovec_entries, struct iovec **iovector) {
   /* Setup return vector... */
   *iovec_entries = 0;
   *iovector      = NULL;
-  if (!(r = iovec_increase(iovec_entries, iovector, OT_SYNC_CHUNK_SIZE)))
+  if (!(r = iovec_new_chunk(iovec_entries, iovector, OT_SYNC_CHUNK_SIZE)))
     return;
 
   /* ... and pointer to end of current output buffer.
@@ -105,21 +103,17 @@ static void sync_make(size_t *iovec_entries, struct iovec **iovector) {
 
         /* Allocate a fresh output buffer at the end of our buffers list
            release bucket and return, if that fails */
-        if (!(r = iovec_fix_increase_or_free(iovec_entries, iovector, r, OT_SYNC_CHUNK_SIZE)))
+        if (!(r = iovec_next_chunk(iovec_entries, iovector, r, OT_SYNC_CHUNK_SIZE)))
           return mutex_bucket_unlock(bucket);
 
         /* Adjust new end of output buffer */
         re = r + OT_SYNC_CHUNK_SIZE;
       }
 
-      *r++ = '2';
-      *r++ = '0';
-      *r++ = ':';
-      memmove(r, hash, sizeof(ot_hash));
-      r += sizeof(ot_hash);
-      r += sprintf(r, "%zd:", byte_count);
-      memmove(r, peer_list->changeset.data, byte_count);
-      r += byte_count;
+      fmt_append(&r, re, "20:");
+      fmt_bytes(&r, re, hash, sizeof(ot_hash));
+      fmt_append(&r, re, "%zd:", byte_count);
+      fmt_bytes(&r, re, peer_list->changeset.data, byte_count);
     }
 
     /* All torrents done: release lock on currenct bucket */
@@ -131,7 +125,7 @@ static void sync_make(size_t *iovec_entries, struct iovec **iovector) {
   *r++ = 'e';
 
   /* Release unused memory in current output buffer */
-  iovec_fixlast(iovec_entries, iovector, r);
+  iovec_trim_last(iovec_entries, iovector, r);
 }
 
 /* This is the entry point into this worker thread