diff --git a/src/stdio/src/printf.rs b/src/stdio/src/printf.rs
index 813213f4dcf9377042724deb0d4b70cc85f05b43..aa9af15fcaea77609ad01b6131bd00f6b008bb9d 100644
--- a/src/stdio/src/printf.rs
+++ b/src/stdio/src/printf.rs
@@ -15,7 +15,7 @@ pub unsafe fn printf<W: Write>(mut w: W, format: *const c_char, mut ap: VaList)
         }
 
         if found_percent {
-            match b as char {
+            if match b as char {
                 '%' => {
                     found_percent = false;
                     w.write_char('%')
@@ -97,11 +97,15 @@ pub unsafe fn printf<W: Write>(mut w: W, format: *const c_char, mut ap: VaList)
                 '#' => Ok(()),
                 '0'...'9' => Ok(()),
                 _ => Ok(()),
-            }.map_err(|_| return -1).unwrap()
+            }.is_err() {
+                return -1;
+            }
         } else if b == b'%' {
             found_percent = true;
         } else {
-            w.write_u8(b).map_err(|_| return -1).unwrap()
+            if w.write_u8(b).is_err() {
+                return -1;
+            }
         }
     }