1 files changed, 5 insertions, 11 deletions
diff --git a/dev/libSystem/src/System.cc b/dev/libSystem/src/System.cc
index 2215c4d8..da9931fe 100644
--- a/dev/libSystem/src/System.cc
+++ b/dev/libSystem/src/System.cc
@@ -7,14 +7,9 @@
 #include <libSystem/SystemKit/Err.h>
 #include <libSystem/SystemKit/Syscall.h>
 #include <libSystem/SystemKit/System.h>
+#include <libSystem/SystemKit/Verify.h>
 
-namespace Detail {
-template <typename T>
-static VoidPtr safe_void_cast(const T* ptr) {
-  _rtl_assert(ptr, "safe void cast failed!");
-  return static_cast<VoidPtr>(const_cast<T*>(ptr));
-}
-}  // namespace Detail
+using namespace LibSystem;
 
 IMPORT_C Void _rtl_assert(Bool expr, const Char* origin) {
   if (!expr) {
@@ -151,9 +146,8 @@ IMPORT_C VoidPtr MmFillMemory(_Input VoidPtr dest, _Input SizeT len, _Input UInt
 }
 
 IMPORT_C Ref IoOpenFile(_Input const Char* path, _Input const Char* drv_letter) {
-  return static_cast<Ref>(libsys_syscall_arg_3(SYSCALL_HASH("IoOpenFile"),
-                                               Detail::safe_void_cast(path),
-                                               Detail::safe_void_cast(drv_letter)));
+  return static_cast<Ref>(libsys_syscall_arg_3(
+      SYSCALL_HASH("IoOpenFile"), Detail::sys_safe_cast(path), Detail::sys_safe_cast(drv_letter)));
 }
 
 IMPORT_C Void IoCloseFile(_Input Ref desc) {
@@ -189,7 +183,7 @@ IMPORT_C SInt32 PrintOut(_Input IORef desc, const Char* fmt, ...) {
 
   // if truncated, `needed` >= kBufferSz; we still send truncated buffer
   auto ret_ptr = libsys_syscall_arg_3(SYSCALL_HASH("PrintOut"), static_cast<VoidPtr>(desc),
-                                      Detail::safe_void_cast(buf));
+                                      Detail::sys_safe_cast(buf));
 
   if (!ret_ptr) return -kErrorInvalidData;