fix -cstrict

vlang · Feb 2, 2025 · 90da7da · 90da7da
1 parent 6cd8253
commit 90da7da
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/vlib/builtin/cfns.c.v b/vlib/builtin/cfns.c.v
@@ -142,6 +142,8 @@ fn C.stat(&char, voidptr) int
 
 fn C.lstat(path &char, buf &C.stat) int
 
+fn C.statvfs(const_path &char, buf &C.statvfs) int
+
 fn C.rename(old_filename &char, new_filename &char) int
 
 fn C.fgets(str &char, n int, stream &C.FILE) int
@@ -514,4 +516,4 @@ fn C.WrappedNSLog(str &u8)
 @[trusted]
 fn C.abs(number int) int
 
-fn C.GetDiskFreeSpaceExA(path charptr, free_bytes_available_to_caller &u64, total_number_of_bytes &u64, total_number_of_free_bytes &u64) bool
+fn C.GetDiskFreeSpaceExA(const_path &char, free_bytes_available_to_caller &u64, total_number_of_bytes &u64, total_number_of_free_bytes &u64) bool
diff --git a/vlib/os/os_nix.c.v b/vlib/os/os_nix.c.v
@@ -539,15 +539,13 @@ struct C.statvfs {
 	f_bavail usize
 }
 
-fn C.statvfs(path charptr, vfs &C.statvfs) int
-
 // disk_usage returns disk usage of `path`
 @[manualfree]
 pub fn disk_usage(path string) !DiskUsage {
 	mpath := if path == '' { '.' } else { path }
 	defer { unsafe { mpath.free() } }
 	mut vfs := C.statvfs{}
-	ret := C.statvfs(mpath.str, &vfs)
+	ret := unsafe { C.statvfs(&char(mpath.str), &vfs) }
 	if ret == -1 {
 		return error('can\`t get disk usage of path')
 	}

diff --git a/vlib/os/os_windows.c.v b/vlib/os/os_windows.c.v
@@ -609,10 +609,11 @@ pub fn disk_usage(path string) !DiskUsage {
 	mut available := u64(0)
 	mut ret := false
 	if path == '.' || path == '' {
-		ret = C.GetDiskFreeSpaceExA(0, &free_bytes_available_to_caller, &total, &available)
-	} else {
-		ret = C.GetDiskFreeSpaceExA(path.str, &free_bytes_available_to_caller, &total,
+		ret = C.GetDiskFreeSpaceExA(&char(0), &free_bytes_available_to_caller, &total,
 			&available)
+	} else {
+		ret = C.GetDiskFreeSpaceExA(&char(path.str), &free_bytes_available_to_caller,
+			&total, &available)
 	}
 	if ret == false {
 		return error('can\`t get disk usage of path')