From 61c31f348c0b627259f7e4e891e923fdddfbe414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Antinori?= Date: Thu, 6 Feb 2025 19:58:54 -0300 Subject: [PATCH] changed wscanf parameters --- src/header/wchar/mod.rs | 4 ++-- tests/wchar/wscanf.c | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/header/wchar/mod.rs b/src/header/wchar/mod.rs index 3d277241ec..7caf3dd1d2 100644 --- a/src/header/wchar/mod.rs +++ b/src/header/wchar/mod.rs @@ -1008,7 +1008,7 @@ pub unsafe extern "C" fn wmemset(ws: *mut wchar_t, wc: wchar_t, n: size_t) -> *m } #[no_mangle] -pub unsafe extern "C" fn wscanf(format: *const wchar_t, ap: va_list) -> c_int { +pub unsafe extern "C" fn wscanf(format: *const wchar_t, mut __valist: ...) -> c_int { let mut file = (*stdin).lock(); if let Err(_) = file.try_set_byte_orientation_unlocked() { return -1; @@ -1016,7 +1016,7 @@ pub unsafe extern "C" fn wscanf(format: *const wchar_t, ap: va_list) -> c_int { let f: &mut FILE = &mut *file; let reader: LookAheadReader = f.into(); - wscanf::scanf(reader, format, ap) + wscanf::scanf(reader, format, __valist.as_va_list()) } #[no_mangle] diff --git a/tests/wchar/wscanf.c b/tests/wchar/wscanf.c index 6d362cc472..55e2858c35 100644 --- a/tests/wchar/wscanf.c +++ b/tests/wchar/wscanf.c @@ -92,9 +92,11 @@ int main () wprintf(L"%d \"%s\" \"%s\" \"%s\" \"%s\"\n", ret, &protobuf, &slashbuf, &hostbuf, &pathbuf); - // wchar_t str [80]; - // wprintf(L"Enter your family name: "); - // wscanf(L"%ls",str); + // wchar_t str [80]; + wchar_t wstring1[20]; + wprintf(L"Enter your family name: "); + wscanf(L"%ls", wstring1); + wprintf (L"Mr. %ls, %d years old.\n", wstring1); return 0; }