sync,szip,term,time,x.ttf: prepare for making -W impure-v the defau…

…lt (vlang#19929)
JalonSolov · Nov 19, 2023 · 6cc51f2 · 6cc51f2
1 parent 8267874
commit 6cc51f2
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 11 deletions.
diff --git a/vlib/sync/pool/pool.v → vlib/sync/pool/pool.c.v b/vlib/sync/pool/pool.v → vlib/sync/pool/pool.c.v
diff --git a/vlib/szip/szip.v → vlib/szip/szip.c.v b/vlib/szip/szip.v → vlib/szip/szip.c.v
diff --git a/vlib/term/termios/termios_test.v → vlib/term/termios/termios_test.c.v b/vlib/term/termios/termios_test.v → vlib/term/termios/termios_test.c.v
diff --git a/vlib/term/ui/ui.v → vlib/term/ui/ui.c.v b/vlib/term/ui/ui.v → vlib/term/ui/ui.c.v
diff --git a/vlib/term/utf8.c.v b/vlib/term/utf8.c.v
diff --git 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 → vlib/time/private_test.c.v b/vlib/time/private_test.v → vlib/time/private_test.c.v
diff --git 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
@@ -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)
 	}
 }