cleanup: replace C.NULL with unsafe { nil } (#28916)

Author: diiviocity

examples/1brc/solution/main.v

@@ -19,13 +19,13 @@ fn mmap_file(path string) MemoryMappedFile {
 	mut mf := MemoryMappedFile{
 		file: os.open_file(path, 'r', 0) or { panic('fail') }
 		size: usize(os.file_size(path))
-		data: C.NULL
+		data: unsafe { nil }
 	}
 
 	// `mmap` returns an untyped mapping pointer; reinterpret it as `&u8` to read the file
 	// bytes. The mapping is owned by this `MemoryMappedFile` and stays valid until `unmap`
 	// calls `munmap`, so the pointer is live for as long as the struct is used.
-	mf.data = unsafe { &u8(C.mmap(C.NULL, mf.size, C.PROT_READ, C.MAP_SHARED, mf.file.fd, 0)) }
+	mf.data = unsafe { &u8(C.mmap(nil, mf.size, C.PROT_READ, C.MAP_SHARED, mf.file.fd, 0)) }
 	return mf
 }
 

vlib/clipboard/clipboard_darwin.c.v

@@ -31,7 +31,7 @@ fn new_clipboard() &Clipboard {
 
 // check_availability returns true if the clipboard is ready to be used.
 pub fn (cb &Clipboard) check_availability() bool {
-	return cb.pb != C.NULL
+	return cb.pb != unsafe { nil }
 }
 
 // clear empties the clipboard contents.

vlib/clipboard/clipboard_windows.c.v

@@ -103,7 +103,7 @@ fn new_clipboard() &Clipboard {
 		println('Failed registering class.')
 	}
 	hwnd := C.CreateWindowEx(0, wndclass.lpsz_class_name, wndclass.lpsz_class_name, 0, 0, 0, 0, 0,
-		C.HWND_MESSAGE, C.NULL, C.NULL, C.NULL)
+		C.HWND_MESSAGE, unsafe { nil }, unsafe { nil }, unsafe { nil })
 	if hwnd == unsafe { nil } {
 		println('Error creating window!')
 	}
@@ -143,7 +143,7 @@ const cp_utf8 = 65001
 fn to_wide(text string) C.HGLOBAL {
 	len_required := C.MultiByteToWideChar(cp_utf8, C.MB_ERR_INVALID_CHARS, voidptr(text.str),
 
-		text.len + 1, C.NULL, 0)
+		text.len + 1, unsafe { nil }, 0)
 	buf := C.GlobalAlloc(C.GMEM_MOVEABLE, i64(sizeof(u16)) * len_required)
 	if buf != unsafe { nil } {
 		mut locked := &u16(C.GlobalLock(buf))

vlib/clipboard/x11/clipboard.c.v

@@ -205,7 +205,7 @@ fn new_x11_clipboard(selection AtomType) &Clipboard {
 
 	display := new_display()
 
-	if display == C.NULL {
+	if display == unsafe { nil } {
 		println('ERROR: No X Server running. Clipboard cannot be used.')
 		return &Clipboard{
 			display: unsafe { nil }
@@ -228,7 +228,7 @@ fn new_x11_clipboard(selection AtomType) &Clipboard {
 
 // check_availability returns `true` if the clipboard is available for use.
 pub fn (cb &Clipboard) check_availability() bool {
-	return cb.display != C.NULL
+	return cb.display != unsafe { nil }
 }
 
 // free releases the clipboard resources.
@@ -520,7 +520,7 @@ fn create_xwindow(display &C.Display) Window {
 }
 
 fn new_display() &C.Display {
-	return C.XOpenDisplay(C.NULL)
+	return C.XOpenDisplay(unsafe { nil })
 }
 
 // new_primary returns a new X11 `PRIMARY` type `Clipboard` instance allocated on the heap.

vlib/fasthttp/fasthttp_linux.c.v

@@ -84,14 +84,14 @@ fn sendfile_without_sigpipe(out_fd i32, in_fd i32, offset &i64, count usize) i32
 		// Consume only the SIGPIPE generated by sendfile before restoring an unblocked mask.
 		timeout := C.timespec{}
 		for {
-			wait_result := C.sigtimedwait(&sigpipe_set, C.NULL, &timeout)
+			wait_result := C.sigtimedwait(&sigpipe_set, unsafe { nil }, &timeout)
 			if wait_result == C.SIGPIPE || C.errno != C.EINTR {
 				break
 			}
 		}
 	}
 
-	restore_result := C.pthread_sigmask(C.SIG_SETMASK, &previous_mask, C.NULL)
+	restore_result := C.pthread_sigmask(C.SIG_SETMASK, &previous_mask, unsafe { nil })
 	if restore_result != 0 {
 		C.errno = restore_result
 		return -1

vlib/fasthttp/fasthttp_linux.v

@@ -232,7 +232,7 @@ fn mod_fd_in_epoll(epoll_fd int, fd int, events u32) int {
 
 // remove_fd_from_epoll removes a file descriptor from the epoll instance
 fn remove_fd_from_epoll(epoll_fd int, fd int) bool {
-	ret := C.epoll_ctl(epoll_fd, C.EPOLL_CTL_DEL, fd, C.NULL)
+	ret := C.epoll_ctl(epoll_fd, C.EPOLL_CTL_DEL, fd, unsafe { nil })
 	if ret == -1 {
 		eprintln('ERROR: epoll_ctl(DEL, fd=${fd}) failed with errno=${C.errno}')
 		return false
@@ -924,7 +924,7 @@ fn handle_writable(mut w Worker, fd int) {
 // registers each with this worker's epoll for readability.
 fn handle_accept_loop(mut w Worker) {
 	for {
-		client_fd := C.accept4(w.listen_fd, C.NULL, C.NULL, C.SOCK_NONBLOCK)
+		client_fd := C.accept4(w.listen_fd, unsafe { nil }, unsafe { nil }, C.SOCK_NONBLOCK)
 		if client_fd < 0 {
 			if C.errno == C.EAGAIN {
 				break // no more incoming connections

vlib/fasthttp/fasthttp_linux_regression_test.v

@@ -523,7 +523,7 @@ fn record_sigpipe_handler(_ os.Signal) {
 
 fn current_thread_blocks_sigpipe() bool {
 	mut current_mask := C.sigset_t{}
-	if C.pthread_sigmask(C.SIG_SETMASK, C.NULL, &current_mask) != 0 {
+	if C.pthread_sigmask(C.SIG_SETMASK, unsafe { nil }, &current_mask) != 0 {
 		return true
 	}
 	return C.sigismember(&current_mask, C.SIGPIPE) == 1

vlib/net/common.c.v

@@ -116,13 +116,13 @@ fn select(handle int, test Select, timeout time.Duration) !bool {
 	if timeout == infinite_timeout {
 		match test {
 			.read {
-				socket_error(C.select(handle + 1, &set, C.NULL, C.NULL, &C.timeval(unsafe { nil })))!
+				socket_error(C.select(handle + 1, &set, unsafe { nil }, unsafe { nil }, &C.timeval(unsafe { nil })))!
 			}
 			.write {
-				socket_error(C.select(handle + 1, C.NULL, &set, C.NULL, &C.timeval(unsafe { nil })))!
+				socket_error(C.select(handle + 1, unsafe { nil }, &set, unsafe { nil }, &C.timeval(unsafe { nil })))!
 			}
 			.except {
-				socket_error(C.select(handle + 1, C.NULL, C.NULL, &set, &C.timeval(unsafe { nil })))!
+				socket_error(C.select(handle + 1, unsafe { nil }, unsafe { nil }, &set, &C.timeval(unsafe { nil })))!
 			}
 		}
 	} else {
@@ -134,13 +134,13 @@ fn select(handle int, test Select, timeout time.Duration) !bool {
 		}
 		match test {
 			.read {
-				socket_error(C.select(handle + 1, &set, C.NULL, C.NULL, &tt))!
+				socket_error(C.select(handle + 1, &set, unsafe { nil }, unsafe { nil }, &tt))!
 			}
 			.write {
-				socket_error(C.select(handle + 1, C.NULL, &set, C.NULL, &tt))!
+				socket_error(C.select(handle + 1, unsafe { nil }, &set, unsafe { nil }, &tt))!
 			}
 			.except {
-				socket_error(C.select(handle + 1, C.NULL, C.NULL, &set, &tt))!
+				socket_error(C.select(handle + 1, unsafe { nil }, unsafe { nil }, &set, &tt))!
 			}
 		}
 	}

vlib/net/mbedtls/ssl_connection.c.v

@@ -1021,13 +1021,13 @@ fn select(handle int, test Select, timeout time.Duration) !bool {
 		mut res := -1
 		match test {
 			.read {
-				res = C.select(handle + 1, &set, C.NULL, C.NULL, timeval_timeout)
+				res = C.select(handle + 1, &set, unsafe { nil }, unsafe { nil }, timeval_timeout)
 			}
 			.write {
-				res = C.select(handle + 1, C.NULL, &set, C.NULL, timeval_timeout)
+				res = C.select(handle + 1, unsafe { nil }, &set, unsafe { nil }, timeval_timeout)
 			}
 			.except {
-				res = C.select(handle + 1, C.NULL, C.NULL, &set, timeval_timeout)
+				res = C.select(handle + 1, unsafe { nil }, unsafe { nil }, &set, timeval_timeout)
 			}
 		}
 

vlib/net/openssl/ssl_connection.c.v

@@ -602,13 +602,13 @@ fn select(handle int, test Select, timeout time.Duration) !bool {
 		mut res := -1
 		match test {
 			.read {
-				res = C.select(handle + 1, &set, C.NULL, C.NULL, timeval_timeout)
+				res = C.select(handle + 1, &set, unsafe { nil }, unsafe { nil }, timeval_timeout)
 			}
 			.write {
-				res = C.select(handle + 1, C.NULL, &set, C.NULL, timeval_timeout)
+				res = C.select(handle + 1, unsafe { nil }, &set, unsafe { nil }, timeval_timeout)
 			}
 			.except {
-				res = C.select(handle + 1, C.NULL, C.NULL, &set, timeval_timeout)
+				res = C.select(handle + 1, unsafe { nil }, unsafe { nil }, &set, timeval_timeout)
 			}
 		}