3 files changed, 9 insertions, 10 deletions
diff --git a/libio/iovswscanf.c b/libio/iovswscanf.c
index f0ab62a19c..262b018fbe 100644
--- a/libio/iovswscanf.c
+++ b/libio/iovswscanf.c
@@ -40,8 +40,8 @@ vswscanf (string, format, args)
   _IO_lock_t lock;
   sf._sbf._f._lock = &lock;
 #endif
-  _IO_no_init (&sf._sbf._f, 0, 1, &wd, &_IO_wstr_jumps);
-  _IO_JUMPS (&sf._sbf._f) = &_IO_str_jumps;
+  _IO_no_init (&sf._sbf._f, 0, 0, &wd, &_IO_wstr_jumps);
+  _IO_fwide (&sf._sbf._f, 1);
   _IO_wstr_init_static (&sf._sbf._f, (wchar_t *)string, 0, NULL);
   ret = _IO_vfwscanf (&sf._sbf._f, format, args, NULL);
   return ret;
diff --git a/libio/vsnprintf.c b/libio/vsnprintf.c
index 2b82df5788..8cf21d31c3 100644
--- a/libio/vsnprintf.c
+++ b/libio/vsnprintf.c
@@ -122,11 +122,11 @@ _IO_vsnprintf (string, maxlen, format, args)
       maxlen = sizeof (sf.overflow_buf);
     }
 
-  _IO_no_init ((_IO_FILE *) &sf, 0, -1, NULL, NULL);
-  _IO_JUMPS ((_IO_FILE *) &sf) = &_IO_strn_jumps;
+  _IO_no_init (&sf.f._sbf._f, 0, -1, NULL, NULL);
+  _IO_JUMPS (&sf.f._sbf._f) = &_IO_strn_jumps;
   string[0] = '\0';
-  _IO_str_init_static ((_IO_FILE *) &sf, string, maxlen - 1, string);
-  ret = _IO_vfprintf ((_IO_FILE *) &sf, format, args);
+  _IO_str_init_static (&sf.f._sbf._f, string, maxlen - 1, string);
+  ret = _IO_vfprintf (&sf.f._sbf._f, format, args);
 
   if (sf.f._sbf._f._IO_buf_base != sf.overflow_buf)
     *sf.f._sbf._f._IO_write_ptr = '\0';
diff --git a/libio/vswprintf.c b/libio/vswprintf.c
index addf39089c..0b4a458568 100644
--- a/libio/vswprintf.c
+++ b/libio/vswprintf.c
@@ -126,12 +126,11 @@ _IO_vswprintf (string, maxlen, format, args)
       maxlen = sizeof (sf.overflow_buf) / sizeof (wchar_t);
     }
 
-  _IO_no_init ((_IO_FILE *) &sf, 0, 0, &wd, NULL);
-  _IO_WIDE_JUMPS ((_IO_FILE *) &sf) = &_IO_wstrn_jumps;
+  _IO_no_init (&sf.f._sbf._f, 0, 0, &wd, &_IO_wstrn_jumps);
   _IO_fwide (&sf.f._sbf._f, 1);
   string[0] = L'\0';
-  _IO_wstr_init_static ((_IO_FILE *) &sf, string, maxlen - 1, string);
-  ret = _IO_vfwprintf ((_IO_FILE *) &sf, format, args);
+  _IO_wstr_init_static (&sf.f._sbf._f, string, maxlen - 1, string);
+  ret = _IO_vfwprintf (&sf.f._sbf._f, format, args);
 
   if (sf.f._sbf._f._wide_data->_IO_buf_base != sf.overflow_buf)
     *sf.f._sbf._f._wide_data->_IO_write_ptr = '\0';