From 6cc51f254f6a6ea921726f6014107a7100ad97d1 Mon Sep 17 00:00:00 2001
From: JalonSolov <JalonSolov@gmail.com>
Date: Sun, 19 Nov 2023 11:33:07 -0500
Subject: [PATCH] sync,szip,term,time,x.ttf: prepare for making `-W impure-v`
 the default (#19929)

---
 vlib/sync/pool/{pool.v => pool.c.v}                    | 0
 vlib/szip/{szip.v => szip.c.v}                         | 0
 vlib/term/termios/{termios_test.v => termios_test.c.v} | 0
 vlib/term/ui/{ui.v => ui.c.v}                          | 0
 vlib/term/utf8.c.v                                     | 6 ------
 vlib/term/utf8.v                                       | 6 +++---
 vlib/time/{private_test.v => private_test.c.v}         | 0
 vlib/x/ttf/common.v                                    | 2 +-
 vlib/x/ttf/render_bmp.v                                | 2 +-
 9 files changed, 5 insertions(+), 11 deletions(-)
 rename vlib/sync/pool/{pool.v => pool.c.v} (100%)
 rename vlib/szip/{szip.v => szip.c.v} (100%)
 rename vlib/term/termios/{termios_test.v => termios_test.c.v} (100%)
 rename vlib/term/ui/{ui.v => ui.c.v} (100%)
 delete mode 100644 vlib/term/utf8.c.v
 rename vlib/time/{private_test.v => private_test.c.v} (100%)

diff --git a/vlib/sync/pool/pool.v b/vlib/sync/pool/pool.c.v
similarity index 100%
rename from vlib/sync/pool/pool.v
rename to vlib/sync/pool/pool.c.v
diff --git a/vlib/szip/szip.v b/vlib/szip/szip.c.v
similarity index 100%
rename from vlib/szip/szip.v
rename to vlib/szip/szip.c.v
diff --git a/vlib/term/termios/termios_test.v b/vlib/term/termios/termios_test.c.v
similarity index 100%
rename from vlib/term/termios/termios_test.v
rename to vlib/term/termios/termios_test.c.v
diff --git a/vlib/term/ui/ui.v b/vlib/term/ui/ui.c.v
similarity index 100%
rename from vlib/term/ui/ui.v
rename to vlib/term/ui/ui.c.v
diff --git a/vlib/term/utf8.c.v b/vlib/term/utf8.c.v
deleted file mode 100644
index c683f84aa7974c..00000000000000
--- a/vlib/term/utf8.c.v
+++ /dev/null
@@ -1,6 +0,0 @@
-module term
-
-@[inline]
-fn getchar() int {
-	return C.getchar()
-}
diff --git a/vlib/term/utf8.v b/vlib/term/utf8.v
index 33c496b8d9519c..4b101b73cf726c 100644
--- a/vlib/term/utf8.v
+++ b/vlib/term/utf8.v
@@ -2,8 +2,8 @@ module term
 
 // utf8_getchar returns an utf8 rune from standard input
 pub fn utf8_getchar() ?rune {
-	c := getchar()
-	if c == C.EOF {
+	c := input_character()
+	if c == -1 {
 		return none
 	}
 	len := utf8_len(u8(~c))
@@ -16,7 +16,7 @@ pub fn utf8_getchar() ?rune {
 	} else {
 		mut uc := c & ((1 << (7 - len)) - 1)
 		for i := 0; i + 1 < len; i++ {
-			c2 := getchar()
+			c2 := input_character()
 			if c2 != -1 && (c2 >> 6) == 2 {
 				uc <<= 6
 				uc |= (c2 & 63)
diff --git a/vlib/time/private_test.v b/vlib/time/private_test.c.v
similarity index 100%
rename from vlib/time/private_test.v
rename to vlib/time/private_test.c.v
diff --git a/vlib/x/ttf/common.v b/vlib/x/ttf/common.v
index 7152f27f3edf16..038d25598cec67 100644
--- a/vlib/x/ttf/common.v
+++ b/vlib/x/ttf/common.v
@@ -88,7 +88,7 @@ fn (mut bmp BitMap) format_texture() {
 pub fn (mut bmp BitMap) save_as_ppm(file_name string) {
 	tmp_buf := bmp.buf
 	mut buf := unsafe { malloc_noscan(bmp.buf_size) }
-	unsafe { C.memcpy(buf, tmp_buf, bmp.buf_size) }
+	unsafe { vmemcpy(buf, tmp_buf, bmp.buf_size) }
 	bmp.buf = buf
 
 	bmp.format_texture()
diff --git a/vlib/x/ttf/render_bmp.v b/vlib/x/ttf/render_bmp.v
index c2016837a90a57..d03a56ba4fdec0 100644
--- a/vlib/x/ttf/render_bmp.v
+++ b/vlib/x/ttf/render_bmp.v
@@ -54,7 +54,7 @@ pub mut:
 pub fn (mut bmp BitMap) clear() {
 	mut sz := bmp.width * bmp.height * bmp.bp
 	unsafe {
-		C.memset(bmp.buf, 0x00, sz)
+		vmemset(bmp.buf, 0x00, sz)
 	}
 }