From 32d542102fd03fabc0d9cfdae5882525c9027ef7 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sun, 17 Apr 2022 16:41:47 +0200
Subject: [PATCH] Removed references to byte; enabled -skip-unused by default

---
 .woodpecker/.build_experimental.yml | 27 ---------------------------
 Makefile                            |  9 ++-------
 src/docker/docker.v                 |  6 +++---
 src/repo/sync.v                     |  2 +-
 src/util/util.v                     |  4 ++--
 src/web/web.v                       |  2 +-
 6 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/.woodpecker/.build_experimental.yml b/.woodpecker/.build_experimental.yml
index faea53d..2c0e20b 100644
--- a/.woodpecker/.build_experimental.yml
+++ b/.woodpecker/.build_experimental.yml
@@ -16,30 +16,3 @@ pipeline:
       - du -h afvieter
     when:
       event: push
-
-  skip-unused:
-    image: 'chewingbever/vlang:latest'
-    pull: true
-    group: 'build'
-    commands:
-      - make skip-unused
-      - readelf -d suvieter
-      - du -h suvieter
-    when:
-      event: push
-
-  skip-unused-static:
-    image: 'chewingbever/vlang:latest'
-    pull: true
-    environment:
-      - LDFLAGS=-lz -lbz2 -llzma -lexpat -lzstd -llz4 -static
-    group: 'build'
-    commands:
-      - make skip-unused
-      - readelf -d suvieter
-      - du -h suvieter
-      - '[ "$(readelf -d suvieter | grep NEEDED | wc -l)" = 0 ]'
-      - strip -s suvieter
-      - du -h suvieter
-    when:
-      event: push
diff --git a/Makefile b/Makefile
index ab67823..cc9c829 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ SRC_DIR := src
 SOURCES != find '$(SRC_DIR)' -iname '*.v'
 
 V_PATH ?= v
-V := $(V_PATH) -showcc -gc boehm
+V := $(V_PATH) -showcc -gc boehm -skip-unused
 
 all: vieter
 
@@ -19,7 +19,7 @@ vieter: $(SOURCES)
 .PHONY: debug
 debug: dvieter
 dvieter: $(SOURCES)
-	$(V_PATH) -showcc -keepc -cg -o dvieter $(SRC_DIR)
+	$(V_PATH) -showcc -keepc -cg -skip-unused -o dvieter $(SRC_DIR)
 
 # Run the debug build inside gdb
 .PHONY: gdb
@@ -83,8 +83,3 @@ clean:
 autofree: afvieter
 afvieter: $(SOURCES)
 	$(V_PATH) -showcc -autofree -o afvieter $(SRC_DIR)
-
-.PHONY: skip-unused
-skip-unused: suvieter
-suvieter: $(SOURCES)
-	$(V_PATH) -showcc -gc boehm -skip-unused -prod -o suvieter $(SRC_DIR)
diff --git a/src/docker/docker.v b/src/docker/docker.v
index a6f7640..07ceb8e 100644
--- a/src/docker/docker.v
+++ b/src/docker/docker.v
@@ -28,8 +28,8 @@ fn send(req &string) ?http.Response {
 	s.wait_for_write() ?
 
 	mut c := 0
-	mut buf := []byte{len: docker.buf_len}
-	mut res := []byte{}
+	mut buf := []u8{len: docker.buf_len}
+	mut res := []u8{}
 
 	for {
 		c = s.read(mut buf) or { return error('Failed to read data from socket ${docker.socket}.') }
@@ -52,7 +52,7 @@ fn send(req &string) ?http.Response {
 
 	// We loop until we've encountered the end of the chunked response
 	// A chunked HTTP response always ends with '0\r\n\r\n'.
-	for res.len < 5 || res#[-5..] != [byte(`0`), `\r`, `\n`, `\r`, `\n`] {
+	for res.len < 5 || res#[-5..] != [u8(`0`), `\r`, `\n`, `\r`, `\n`] {
 		// Wait for the server to respond
 		s.wait_for_write() ?
 
diff --git a/src/repo/sync.v b/src/repo/sync.v
index e2b7aac..12756b7 100644
--- a/src/repo/sync.v
+++ b/src/repo/sync.v
@@ -19,7 +19,7 @@ fn archive_add_entry(archive &C.archive, entry &C.archive_entry, file_path &stri
 	}
 
 	// Write the file to the archive
-	buf := [8192]byte{}
+	buf := [8192]u8{}
 	mut len := C.read(fd, &buf, sizeof(buf))
 
 	for len > 0 {
diff --git a/src/util/util.v b/src/util/util.v
index 228f584..c1af30e 100644
--- a/src/util/util.v
+++ b/src/util/util.v
@@ -30,7 +30,7 @@ pub fn reader_to_file(mut reader io.BufferedReader, length int, path string) ? {
 		file.close()
 	}
 
-	mut buf := []byte{len: util.reader_buf_size}
+	mut buf := []u8{len: util.reader_buf_size}
 	mut bytes_left := length
 
 	// Repeat as long as the stream still has data
@@ -60,7 +60,7 @@ pub fn hash_file(path &string) ?(string, string) {
 	mut sha256sum := sha256.new()
 
 	buf_size := int(1_000_000)
-	mut buf := []byte{len: buf_size}
+	mut buf := []u8{len: buf_size}
 	mut bytes_left := os.file_size(path)
 
 	for bytes_left > 0 {
diff --git a/src/web/web.v b/src/web/web.v
index 688f854..3e7b047 100644
--- a/src/web/web.v
+++ b/src/web/web.v
@@ -285,7 +285,7 @@ pub fn (mut ctx Context) file(f_path string) Result {
 	resp.set_status(ctx.status)
 	send_string(mut ctx.conn, resp.bytestr()) or { return Result{} }
 
-	mut buf := []byte{len: 1_000_000}
+	mut buf := []u8{len: 1_000_000}
 	mut bytes_left := file_size
 
 	// Repeat as long as the stream still has data