diff --git a/src/header/wchar/lookaheadreader.rs b/src/header/wchar/lookaheadreader.rs index 742fba372ea2e92a03747d13e3c5734d04565ee4..7f98c9b4c8d37e9fffa8566274ca65765ebc58ba 100644 --- a/src/header/wchar/lookaheadreader.rs +++ b/src/header/wchar/lookaheadreader.rs @@ -115,11 +115,9 @@ impl<'a> From<&'a mut FILE> for LookAheadFile<'a> { enum LookAheadReaderEnum<'a> { FILE(LookAheadFile<'a>), - // (buffer, location) BUFFER(LookAheadBuffer), } -// pub struct LookAheadReader(LookAheadBuffer); pub struct LookAheadReader<'a>(LookAheadReaderEnum<'a>); impl LookAheadReader<'_> { @@ -138,7 +136,7 @@ impl LookAheadReader<'_> { } impl<'a> From<&'a mut FILE> for LookAheadReader<'a> { - fn from(f: &'a mut FILE) -> LookAheadReader { + fn from(f: &'a mut FILE) -> LookAheadReader<'a> { LookAheadReader(LookAheadReaderEnum::FILE(f.into())) } } diff --git a/src/header/wchar/wscanf.rs b/src/header/wchar/wscanf.rs index 0e461531080e7ac63e161764798e15636e426fa4..ff61874a5cfd3cd9f5bda61d5705d00a5b2b8619 100644 --- a/src/header/wchar/wscanf.rs +++ b/src/header/wchar/wscanf.rs @@ -26,7 +26,7 @@ unsafe fn next_char(string: &mut *const wchar_t) -> Result<wint_t, c_int> { let c = **string as wint_t; *string = string.offset(1); if c == 0 { - Err(-2) + Err(-1) } else { Ok(c) } @@ -34,10 +34,7 @@ unsafe fn next_char(string: &mut *const wchar_t) -> Result<wint_t, c_int> { macro_rules! wc_as_char { ($c:ident) => { - char::try_from($c).map_err(|e| { - println!("{:?}", e); - -3 - })? + char::try_from($c).map_err(|_| -1)? }; } @@ -75,7 +72,7 @@ unsafe fn inner_scanf( (inner $($placeholder:expr)*) => { if !skip_read && !read!() { match matched { - 0 => return Ok(-4), + 0 => return Ok(-1), a => return Ok(a), } } @@ -124,7 +121,7 @@ unsafe fn inner_scanf( } else { match width.parse::<usize>() { Ok(n) => Some(n), - Err(_) => return Err(-5), + Err(_) => return Err(-1), } }; @@ -496,7 +493,7 @@ unsafe fn inner_scanf( *ap.arg::<*mut c_int>() = count as c_int; } } - _ => return Err(-6), + _ => return Err(-1), } if eof {