* stdio/wcstof.c: Deleted. * misc/wcstof.c: Added from trunk. * misc/mbrtowc.c, misc/wcrtomb.c, misc/wcstold.c: Merge rev.2245 changes from trunk. * Makefile.am: Remove stdio/wcstof.c from build, add misc/wcstof.c to build. * Makefile.in: Regenerate. * misc/mbrtowc.c, misc/wcrtomb.c, misc/wcstof.c, misc/wcstold.c, misc/wctob.c: Fix utterly incomprehensible whitespace style. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/branches/releases/v1.0@4351 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-crt/ChangeLog b/mingw-w64-crt/ChangeLog index 2701369..2aff402 100644 --- a/mingw-w64-crt/ChangeLog +++ b/mingw-w64-crt/ChangeLog
@@ -1,3 +1,15 @@ +2011-08-09 Ozkan Sezer <sezeroz@gmail.com> + + * stdio/wcstof.c: Deleted. + * misc/wcstof.c: Added from trunk. + * misc/mbrtowc.c, misc/wcrtomb.c, misc/wcstold.c: Merge rev.2245 + changes from trunk. + * Makefile.am: Remove stdio/wcstof.c from build, add misc/wcstof.c + to build. + * Makefile.in: Regenerate. + * misc/mbrtowc.c, misc/wcrtomb.c, misc/wcstof.c, misc/wcstold.c, + misc/wctob.c: Fix utterly incomprehensible whitespace style. + 2011-07-26 Ozkan Sezer <sezeroz@gmail.com> Merge from trunk rev. 4299:
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am index fe1443d..1146157 100644 --- a/mingw-w64-crt/Makefile.am +++ b/mingw-w64-crt/Makefile.am
@@ -203,7 +203,7 @@ misc/wcstoumax.c misc/_wctime32.c misc/_wctime.c misc/wctob.c misc/wctrans.c \ misc/wctype.c misc/wdirent.c misc/winbs_uint64.c misc/winbs_ulong.c misc/winbs_ushort.c \ misc/wmemchr.c misc/wmemcmp.c misc/wmemcpy.c misc/wmemmove.c misc/wmemset.c \ - \ + misc/wcstof.c \ stdio/mingw_pformat.h \ stdio/atoll.c stdio/_Exit.c stdio/_findfirst64i32.c stdio/_findnext64i32.c stdio/fopen64.c \ stdio/fseeko64.c stdio/_fstat64i32.c stdio/_fstat.c stdio/ftello64.c stdio/_ftime.c \ @@ -212,8 +212,8 @@ stdio/mingw_vsnprintf.c stdio/mingw_vsprintf.c stdio/snprintf.c stdio/snwprintf.c stdio/_stat64i32.c \ stdio/_stat.c stdio/strtof.c stdio/ulltoa.c stdio/ulltow.c stdio/vfscanf.c \ stdio/vfwscanf.c stdio/vscanf.c stdio/vsnprintf.c stdio/vsnwprintf.c stdio/vsscanf.c \ - stdio/vswscanf.c stdio/vwscanf.c stdio/wcstof.c stdio/_wfindfirst64i32.c stdio/_wfindnext64i32.c \ - stdio/_wstat64i32.c stdio/_wstat.c stdio/wtoll.c \ + stdio/vswscanf.c stdio/vwscanf.c stdio/_wfindfirst64i32.c stdio/_wfindnext64i32.c stdio/_wstat64i32.c \ + stdio/_wstat.c stdio/wtoll.c \ \ intrincs/ilockadd.c intrincs/ilockand64.c intrincs/ilockcxch64.c intrincs/ilockcxchptr.c intrincs/ilockdec64.c \ intrincs/ilockexch64.c intrincs/ilockexchptr.c intrincs/ilockinc64.c intrincs/ilockor64.c intrincs/ilockxor64.c \
diff --git a/mingw-w64-crt/Makefile.in b/mingw-w64-crt/Makefile.in index 10b19ed..4482acf 100644 --- a/mingw-w64-crt/Makefile.in +++ b/mingw-w64-crt/Makefile.in
@@ -345,22 +345,22 @@ misc/wctype.c misc/wdirent.c misc/winbs_uint64.c \ misc/winbs_ulong.c misc/winbs_ushort.c misc/wmemchr.c \ misc/wmemcmp.c misc/wmemcpy.c misc/wmemmove.c misc/wmemset.c \ - stdio/mingw_pformat.h stdio/atoll.c stdio/_Exit.c \ - stdio/_findfirst64i32.c stdio/_findnext64i32.c stdio/fopen64.c \ - stdio/fseeko64.c stdio/_fstat64i32.c stdio/_fstat.c \ - stdio/ftello64.c stdio/_ftime.c stdio/lltoa.c stdio/lltow.c \ - stdio/lseek64.c stdio/mingw_fprintf.c stdio/mingw_pformat.c \ - stdio/mingw_printf.c stdio/mingw_snprintf.c \ - stdio/mingw_sprintf.c stdio/mingw_vfprintf.c \ - stdio/mingw_vprintf.c stdio/mingw_vsnprintf.c \ - stdio/mingw_vsprintf.c stdio/snprintf.c stdio/snwprintf.c \ - stdio/_stat64i32.c stdio/_stat.c stdio/strtof.c stdio/ulltoa.c \ - stdio/ulltow.c stdio/vfscanf.c stdio/vfwscanf.c stdio/vscanf.c \ + misc/wcstof.c stdio/mingw_pformat.h stdio/atoll.c \ + stdio/_Exit.c stdio/_findfirst64i32.c stdio/_findnext64i32.c \ + stdio/fopen64.c stdio/fseeko64.c stdio/_fstat64i32.c \ + stdio/_fstat.c stdio/ftello64.c stdio/_ftime.c stdio/lltoa.c \ + stdio/lltow.c stdio/lseek64.c stdio/mingw_fprintf.c \ + stdio/mingw_pformat.c stdio/mingw_printf.c \ + stdio/mingw_snprintf.c stdio/mingw_sprintf.c \ + stdio/mingw_vfprintf.c stdio/mingw_vprintf.c \ + stdio/mingw_vsnprintf.c stdio/mingw_vsprintf.c \ + stdio/snprintf.c stdio/snwprintf.c stdio/_stat64i32.c \ + stdio/_stat.c stdio/strtof.c stdio/ulltoa.c stdio/ulltow.c \ + stdio/vfscanf.c stdio/vfwscanf.c stdio/vscanf.c \ stdio/vsnprintf.c stdio/vsnwprintf.c stdio/vsscanf.c \ - stdio/vswscanf.c stdio/vwscanf.c stdio/wcstof.c \ - stdio/_wfindfirst64i32.c stdio/_wfindnext64i32.c \ - stdio/_wstat64i32.c stdio/_wstat.c stdio/wtoll.c \ - intrincs/ilockadd.c intrincs/ilockand64.c \ + stdio/vswscanf.c stdio/vwscanf.c stdio/_wfindfirst64i32.c \ + stdio/_wfindnext64i32.c stdio/_wstat64i32.c stdio/_wstat.c \ + stdio/wtoll.c intrincs/ilockadd.c intrincs/ilockand64.c \ intrincs/ilockcxch64.c intrincs/ilockcxchptr.c \ intrincs/ilockdec64.c intrincs/ilockexch64.c \ intrincs/ilockexchptr.c intrincs/ilockinc64.c \ @@ -756,6 +756,7 @@ misc/lib32_libmingwex_a-wmemcpy.$(OBJEXT) \ misc/lib32_libmingwex_a-wmemmove.$(OBJEXT) \ misc/lib32_libmingwex_a-wmemset.$(OBJEXT) \ + misc/lib32_libmingwex_a-wcstof.$(OBJEXT) \ stdio/lib32_libmingwex_a-atoll.$(OBJEXT) \ stdio/lib32_libmingwex_a-_Exit.$(OBJEXT) \ stdio/lib32_libmingwex_a-_findfirst64i32.$(OBJEXT) \ @@ -793,7 +794,6 @@ stdio/lib32_libmingwex_a-vsscanf.$(OBJEXT) \ stdio/lib32_libmingwex_a-vswscanf.$(OBJEXT) \ stdio/lib32_libmingwex_a-vwscanf.$(OBJEXT) \ - stdio/lib32_libmingwex_a-wcstof.$(OBJEXT) \ stdio/lib32_libmingwex_a-_wfindfirst64i32.$(OBJEXT) \ stdio/lib32_libmingwex_a-_wfindnext64i32.$(OBJEXT) \ stdio/lib32_libmingwex_a-_wstat64i32.$(OBJEXT) \ @@ -1254,22 +1254,22 @@ misc/wctype.c misc/wdirent.c misc/winbs_uint64.c \ misc/winbs_ulong.c misc/winbs_ushort.c misc/wmemchr.c \ misc/wmemcmp.c misc/wmemcpy.c misc/wmemmove.c misc/wmemset.c \ - stdio/mingw_pformat.h stdio/atoll.c stdio/_Exit.c \ - stdio/_findfirst64i32.c stdio/_findnext64i32.c stdio/fopen64.c \ - stdio/fseeko64.c stdio/_fstat64i32.c stdio/_fstat.c \ - stdio/ftello64.c stdio/_ftime.c stdio/lltoa.c stdio/lltow.c \ - stdio/lseek64.c stdio/mingw_fprintf.c stdio/mingw_pformat.c \ - stdio/mingw_printf.c stdio/mingw_snprintf.c \ - stdio/mingw_sprintf.c stdio/mingw_vfprintf.c \ - stdio/mingw_vprintf.c stdio/mingw_vsnprintf.c \ - stdio/mingw_vsprintf.c stdio/snprintf.c stdio/snwprintf.c \ - stdio/_stat64i32.c stdio/_stat.c stdio/strtof.c stdio/ulltoa.c \ - stdio/ulltow.c stdio/vfscanf.c stdio/vfwscanf.c stdio/vscanf.c \ + misc/wcstof.c stdio/mingw_pformat.h stdio/atoll.c \ + stdio/_Exit.c stdio/_findfirst64i32.c stdio/_findnext64i32.c \ + stdio/fopen64.c stdio/fseeko64.c stdio/_fstat64i32.c \ + stdio/_fstat.c stdio/ftello64.c stdio/_ftime.c stdio/lltoa.c \ + stdio/lltow.c stdio/lseek64.c stdio/mingw_fprintf.c \ + stdio/mingw_pformat.c stdio/mingw_printf.c \ + stdio/mingw_snprintf.c stdio/mingw_sprintf.c \ + stdio/mingw_vfprintf.c stdio/mingw_vprintf.c \ + stdio/mingw_vsnprintf.c stdio/mingw_vsprintf.c \ + stdio/snprintf.c stdio/snwprintf.c stdio/_stat64i32.c \ + stdio/_stat.c stdio/strtof.c stdio/ulltoa.c stdio/ulltow.c \ + stdio/vfscanf.c stdio/vfwscanf.c stdio/vscanf.c \ stdio/vsnprintf.c stdio/vsnwprintf.c stdio/vsscanf.c \ - stdio/vswscanf.c stdio/vwscanf.c stdio/wcstof.c \ - stdio/_wfindfirst64i32.c stdio/_wfindnext64i32.c \ - stdio/_wstat64i32.c stdio/_wstat.c stdio/wtoll.c \ - intrincs/ilockadd.c intrincs/ilockand64.c \ + stdio/vswscanf.c stdio/vwscanf.c stdio/_wfindfirst64i32.c \ + stdio/_wfindnext64i32.c stdio/_wstat64i32.c stdio/_wstat.c \ + stdio/wtoll.c intrincs/ilockadd.c intrincs/ilockand64.c \ intrincs/ilockcxch64.c intrincs/ilockcxchptr.c \ intrincs/ilockdec64.c intrincs/ilockexch64.c \ intrincs/ilockexchptr.c intrincs/ilockinc64.c \ @@ -1672,6 +1672,7 @@ misc/lib64_libmingwex_a-wmemcpy.$(OBJEXT) \ misc/lib64_libmingwex_a-wmemmove.$(OBJEXT) \ misc/lib64_libmingwex_a-wmemset.$(OBJEXT) \ + misc/lib64_libmingwex_a-wcstof.$(OBJEXT) \ stdio/lib64_libmingwex_a-atoll.$(OBJEXT) \ stdio/lib64_libmingwex_a-_Exit.$(OBJEXT) \ stdio/lib64_libmingwex_a-_findfirst64i32.$(OBJEXT) \ @@ -1709,7 +1710,6 @@ stdio/lib64_libmingwex_a-vsscanf.$(OBJEXT) \ stdio/lib64_libmingwex_a-vswscanf.$(OBJEXT) \ stdio/lib64_libmingwex_a-vwscanf.$(OBJEXT) \ - stdio/lib64_libmingwex_a-wcstof.$(OBJEXT) \ stdio/lib64_libmingwex_a-_wfindfirst64i32.$(OBJEXT) \ stdio/lib64_libmingwex_a-_wfindnext64i32.$(OBJEXT) \ stdio/lib64_libmingwex_a-_wstat64i32.$(OBJEXT) \ @@ -2433,7 +2433,7 @@ misc/wcstoumax.c misc/_wctime32.c misc/_wctime.c misc/wctob.c misc/wctrans.c \ misc/wctype.c misc/wdirent.c misc/winbs_uint64.c misc/winbs_ulong.c misc/winbs_ushort.c \ misc/wmemchr.c misc/wmemcmp.c misc/wmemcpy.c misc/wmemmove.c misc/wmemset.c \ - \ + misc/wcstof.c \ stdio/mingw_pformat.h \ stdio/atoll.c stdio/_Exit.c stdio/_findfirst64i32.c stdio/_findnext64i32.c stdio/fopen64.c \ stdio/fseeko64.c stdio/_fstat64i32.c stdio/_fstat.c stdio/ftello64.c stdio/_ftime.c \ @@ -2442,8 +2442,8 @@ stdio/mingw_vsnprintf.c stdio/mingw_vsprintf.c stdio/snprintf.c stdio/snwprintf.c stdio/_stat64i32.c \ stdio/_stat.c stdio/strtof.c stdio/ulltoa.c stdio/ulltow.c stdio/vfscanf.c \ stdio/vfwscanf.c stdio/vscanf.c stdio/vsnprintf.c stdio/vsnwprintf.c stdio/vsscanf.c \ - stdio/vswscanf.c stdio/vwscanf.c stdio/wcstof.c stdio/_wfindfirst64i32.c stdio/_wfindnext64i32.c \ - stdio/_wstat64i32.c stdio/_wstat.c stdio/wtoll.c \ + stdio/vswscanf.c stdio/vwscanf.c stdio/_wfindfirst64i32.c stdio/_wfindnext64i32.c stdio/_wstat64i32.c \ + stdio/_wstat.c stdio/wtoll.c \ \ intrincs/ilockadd.c intrincs/ilockand64.c intrincs/ilockcxch64.c intrincs/ilockcxchptr.c intrincs/ilockdec64.c \ intrincs/ilockexch64.c intrincs/ilockexchptr.c intrincs/ilockinc64.c intrincs/ilockor64.c intrincs/ilockxor64.c \ @@ -4075,6 +4075,8 @@ misc/$(DEPDIR)/$(am__dirstamp) misc/lib32_libmingwex_a-wmemset.$(OBJEXT): misc/$(am__dirstamp) \ misc/$(DEPDIR)/$(am__dirstamp) +misc/lib32_libmingwex_a-wcstof.$(OBJEXT): misc/$(am__dirstamp) \ + misc/$(DEPDIR)/$(am__dirstamp) stdio/$(am__dirstamp): @$(MKDIR_P) stdio @: > stdio/$(am__dirstamp) @@ -4155,8 +4157,6 @@ stdio/$(DEPDIR)/$(am__dirstamp) stdio/lib32_libmingwex_a-vwscanf.$(OBJEXT): stdio/$(am__dirstamp) \ stdio/$(DEPDIR)/$(am__dirstamp) -stdio/lib32_libmingwex_a-wcstof.$(OBJEXT): stdio/$(am__dirstamp) \ - stdio/$(DEPDIR)/$(am__dirstamp) stdio/lib32_libmingwex_a-_wfindfirst64i32.$(OBJEXT): \ stdio/$(am__dirstamp) stdio/$(DEPDIR)/$(am__dirstamp) stdio/lib32_libmingwex_a-_wfindnext64i32.$(OBJEXT): \ @@ -5414,6 +5414,8 @@ misc/$(DEPDIR)/$(am__dirstamp) misc/lib64_libmingwex_a-wmemset.$(OBJEXT): misc/$(am__dirstamp) \ misc/$(DEPDIR)/$(am__dirstamp) +misc/lib64_libmingwex_a-wcstof.$(OBJEXT): misc/$(am__dirstamp) \ + misc/$(DEPDIR)/$(am__dirstamp) stdio/lib64_libmingwex_a-atoll.$(OBJEXT): stdio/$(am__dirstamp) \ stdio/$(DEPDIR)/$(am__dirstamp) stdio/lib64_libmingwex_a-_Exit.$(OBJEXT): stdio/$(am__dirstamp) \ @@ -5488,8 +5490,6 @@ stdio/$(DEPDIR)/$(am__dirstamp) stdio/lib64_libmingwex_a-vwscanf.$(OBJEXT): stdio/$(am__dirstamp) \ stdio/$(DEPDIR)/$(am__dirstamp) -stdio/lib64_libmingwex_a-wcstof.$(OBJEXT): stdio/$(am__dirstamp) \ - stdio/$(DEPDIR)/$(am__dirstamp) stdio/lib64_libmingwex_a-_wfindfirst64i32.$(OBJEXT): \ stdio/$(am__dirstamp) stdio/$(DEPDIR)/$(am__dirstamp) stdio/lib64_libmingwex_a-_wfindnext64i32.$(OBJEXT): \ @@ -6987,6 +6987,7 @@ -rm -f misc/lib32_libmingwex_a-wassert.$(OBJEXT) -rm -f misc/lib32_libmingwex_a-wcrtomb.$(OBJEXT) -rm -f misc/lib32_libmingwex_a-wcsnlen.$(OBJEXT) + -rm -f misc/lib32_libmingwex_a-wcstof.$(OBJEXT) -rm -f misc/lib32_libmingwex_a-wcstoimax.$(OBJEXT) -rm -f misc/lib32_libmingwex_a-wcstold.$(OBJEXT) -rm -f misc/lib32_libmingwex_a-wcstoumax.$(OBJEXT) @@ -7076,6 +7077,7 @@ -rm -f misc/lib64_libmingwex_a-wassert.$(OBJEXT) -rm -f misc/lib64_libmingwex_a-wcrtomb.$(OBJEXT) -rm -f misc/lib64_libmingwex_a-wcsnlen.$(OBJEXT) + -rm -f misc/lib64_libmingwex_a-wcstof.$(OBJEXT) -rm -f misc/lib64_libmingwex_a-wcstoimax.$(OBJEXT) -rm -f misc/lib64_libmingwex_a-wcstold.$(OBJEXT) -rm -f misc/lib64_libmingwex_a-wcstoumax.$(OBJEXT) @@ -7140,7 +7142,6 @@ -rm -f stdio/lib32_libmingwex_a-vsscanf.$(OBJEXT) -rm -f stdio/lib32_libmingwex_a-vswscanf.$(OBJEXT) -rm -f stdio/lib32_libmingwex_a-vwscanf.$(OBJEXT) - -rm -f stdio/lib32_libmingwex_a-wcstof.$(OBJEXT) -rm -f stdio/lib32_libmingwex_a-wtoll.$(OBJEXT) -rm -f stdio/lib64_libmingwex_a-_Exit.$(OBJEXT) -rm -f stdio/lib64_libmingwex_a-_findfirst64i32.$(OBJEXT) @@ -7183,7 +7184,6 @@ -rm -f stdio/lib64_libmingwex_a-vsscanf.$(OBJEXT) -rm -f stdio/lib64_libmingwex_a-vswscanf.$(OBJEXT) -rm -f stdio/lib64_libmingwex_a-vwscanf.$(OBJEXT) - -rm -f stdio/lib64_libmingwex_a-wcstof.$(OBJEXT) -rm -f stdio/lib64_libmingwex_a-wtoll.$(OBJEXT) -rm -f testcases/t_ansi_io.$(OBJEXT) -rm -f testcases/t_float.$(OBJEXT) @@ -8234,6 +8234,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@misc/$(DEPDIR)/lib32_libmingwex_a-wassert.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@misc/$(DEPDIR)/lib32_libmingwex_a-wcrtomb.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@misc/$(DEPDIR)/lib32_libmingwex_a-wcsnlen.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@misc/$(DEPDIR)/lib32_libmingwex_a-wcstof.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@misc/$(DEPDIR)/lib32_libmingwex_a-wcstoimax.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@misc/$(DEPDIR)/lib32_libmingwex_a-wcstold.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@misc/$(DEPDIR)/lib32_libmingwex_a-wcstoumax.Po@am__quote@ @@ -8323,6 +8324,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@misc/$(DEPDIR)/lib64_libmingwex_a-wassert.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@misc/$(DEPDIR)/lib64_libmingwex_a-wcrtomb.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@misc/$(DEPDIR)/lib64_libmingwex_a-wcsnlen.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@misc/$(DEPDIR)/lib64_libmingwex_a-wcstof.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@misc/$(DEPDIR)/lib64_libmingwex_a-wcstoimax.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@misc/$(DEPDIR)/lib64_libmingwex_a-wcstold.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@misc/$(DEPDIR)/lib64_libmingwex_a-wcstoumax.Po@am__quote@ @@ -8387,7 +8389,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@stdio/$(DEPDIR)/lib32_libmingwex_a-vsscanf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@stdio/$(DEPDIR)/lib32_libmingwex_a-vswscanf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@stdio/$(DEPDIR)/lib32_libmingwex_a-vwscanf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@stdio/$(DEPDIR)/lib32_libmingwex_a-wcstof.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@stdio/$(DEPDIR)/lib32_libmingwex_a-wtoll.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@stdio/$(DEPDIR)/lib64_libmingwex_a-_Exit.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@stdio/$(DEPDIR)/lib64_libmingwex_a-_findfirst64i32.Po@am__quote@ @@ -8430,7 +8431,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@stdio/$(DEPDIR)/lib64_libmingwex_a-vsscanf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@stdio/$(DEPDIR)/lib64_libmingwex_a-vswscanf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@stdio/$(DEPDIR)/lib64_libmingwex_a-vwscanf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@stdio/$(DEPDIR)/lib64_libmingwex_a-wcstof.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@stdio/$(DEPDIR)/lib64_libmingwex_a-wtoll.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@testcases/$(DEPDIR)/t_ansi_io.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@testcases/$(DEPDIR)/t_float.Po@am__quote@ @@ -15151,6 +15151,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc/lib32_libmingwex_a-wmemset.obj `if test -f 'misc/wmemset.c'; then $(CYGPATH_W) 'misc/wmemset.c'; else $(CYGPATH_W) '$(srcdir)/misc/wmemset.c'; fi` +misc/lib32_libmingwex_a-wcstof.o: misc/wcstof.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc/lib32_libmingwex_a-wcstof.o -MD -MP -MF misc/$(DEPDIR)/lib32_libmingwex_a-wcstof.Tpo -c -o misc/lib32_libmingwex_a-wcstof.o `test -f 'misc/wcstof.c' || echo '$(srcdir)/'`misc/wcstof.c +@am__fastdepCC_TRUE@ $(am__mv) misc/$(DEPDIR)/lib32_libmingwex_a-wcstof.Tpo misc/$(DEPDIR)/lib32_libmingwex_a-wcstof.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='misc/wcstof.c' object='misc/lib32_libmingwex_a-wcstof.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc/lib32_libmingwex_a-wcstof.o `test -f 'misc/wcstof.c' || echo '$(srcdir)/'`misc/wcstof.c + +misc/lib32_libmingwex_a-wcstof.obj: misc/wcstof.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc/lib32_libmingwex_a-wcstof.obj -MD -MP -MF misc/$(DEPDIR)/lib32_libmingwex_a-wcstof.Tpo -c -o misc/lib32_libmingwex_a-wcstof.obj `if test -f 'misc/wcstof.c'; then $(CYGPATH_W) 'misc/wcstof.c'; else $(CYGPATH_W) '$(srcdir)/misc/wcstof.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) misc/$(DEPDIR)/lib32_libmingwex_a-wcstof.Tpo misc/$(DEPDIR)/lib32_libmingwex_a-wcstof.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='misc/wcstof.c' object='misc/lib32_libmingwex_a-wcstof.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc/lib32_libmingwex_a-wcstof.obj `if test -f 'misc/wcstof.c'; then $(CYGPATH_W) 'misc/wcstof.c'; else $(CYGPATH_W) '$(srcdir)/misc/wcstof.c'; fi` + stdio/lib32_libmingwex_a-atoll.o: stdio/atoll.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stdio/lib32_libmingwex_a-atoll.o -MD -MP -MF stdio/$(DEPDIR)/lib32_libmingwex_a-atoll.Tpo -c -o stdio/lib32_libmingwex_a-atoll.o `test -f 'stdio/atoll.c' || echo '$(srcdir)/'`stdio/atoll.c @am__fastdepCC_TRUE@ $(am__mv) stdio/$(DEPDIR)/lib32_libmingwex_a-atoll.Tpo stdio/$(DEPDIR)/lib32_libmingwex_a-atoll.Po @@ -15669,20 +15683,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stdio/lib32_libmingwex_a-vwscanf.obj `if test -f 'stdio/vwscanf.c'; then $(CYGPATH_W) 'stdio/vwscanf.c'; else $(CYGPATH_W) '$(srcdir)/stdio/vwscanf.c'; fi` -stdio/lib32_libmingwex_a-wcstof.o: stdio/wcstof.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stdio/lib32_libmingwex_a-wcstof.o -MD -MP -MF stdio/$(DEPDIR)/lib32_libmingwex_a-wcstof.Tpo -c -o stdio/lib32_libmingwex_a-wcstof.o `test -f 'stdio/wcstof.c' || echo '$(srcdir)/'`stdio/wcstof.c -@am__fastdepCC_TRUE@ $(am__mv) stdio/$(DEPDIR)/lib32_libmingwex_a-wcstof.Tpo stdio/$(DEPDIR)/lib32_libmingwex_a-wcstof.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='stdio/wcstof.c' object='stdio/lib32_libmingwex_a-wcstof.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stdio/lib32_libmingwex_a-wcstof.o `test -f 'stdio/wcstof.c' || echo '$(srcdir)/'`stdio/wcstof.c - -stdio/lib32_libmingwex_a-wcstof.obj: stdio/wcstof.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stdio/lib32_libmingwex_a-wcstof.obj -MD -MP -MF stdio/$(DEPDIR)/lib32_libmingwex_a-wcstof.Tpo -c -o stdio/lib32_libmingwex_a-wcstof.obj `if test -f 'stdio/wcstof.c'; then $(CYGPATH_W) 'stdio/wcstof.c'; else $(CYGPATH_W) '$(srcdir)/stdio/wcstof.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) stdio/$(DEPDIR)/lib32_libmingwex_a-wcstof.Tpo stdio/$(DEPDIR)/lib32_libmingwex_a-wcstof.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='stdio/wcstof.c' object='stdio/lib32_libmingwex_a-wcstof.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stdio/lib32_libmingwex_a-wcstof.obj `if test -f 'stdio/wcstof.c'; then $(CYGPATH_W) 'stdio/wcstof.c'; else $(CYGPATH_W) '$(srcdir)/stdio/wcstof.c'; fi` - stdio/lib32_libmingwex_a-_wfindfirst64i32.o: stdio/_wfindfirst64i32.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stdio/lib32_libmingwex_a-_wfindfirst64i32.o -MD -MP -MF stdio/$(DEPDIR)/lib32_libmingwex_a-_wfindfirst64i32.Tpo -c -o stdio/lib32_libmingwex_a-_wfindfirst64i32.o `test -f 'stdio/_wfindfirst64i32.c' || echo '$(srcdir)/'`stdio/_wfindfirst64i32.c @am__fastdepCC_TRUE@ $(am__mv) stdio/$(DEPDIR)/lib32_libmingwex_a-_wfindfirst64i32.Tpo stdio/$(DEPDIR)/lib32_libmingwex_a-_wfindfirst64i32.Po @@ -23061,6 +23061,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc/lib64_libmingwex_a-wmemset.obj `if test -f 'misc/wmemset.c'; then $(CYGPATH_W) 'misc/wmemset.c'; else $(CYGPATH_W) '$(srcdir)/misc/wmemset.c'; fi` +misc/lib64_libmingwex_a-wcstof.o: misc/wcstof.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc/lib64_libmingwex_a-wcstof.o -MD -MP -MF misc/$(DEPDIR)/lib64_libmingwex_a-wcstof.Tpo -c -o misc/lib64_libmingwex_a-wcstof.o `test -f 'misc/wcstof.c' || echo '$(srcdir)/'`misc/wcstof.c +@am__fastdepCC_TRUE@ $(am__mv) misc/$(DEPDIR)/lib64_libmingwex_a-wcstof.Tpo misc/$(DEPDIR)/lib64_libmingwex_a-wcstof.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='misc/wcstof.c' object='misc/lib64_libmingwex_a-wcstof.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc/lib64_libmingwex_a-wcstof.o `test -f 'misc/wcstof.c' || echo '$(srcdir)/'`misc/wcstof.c + +misc/lib64_libmingwex_a-wcstof.obj: misc/wcstof.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc/lib64_libmingwex_a-wcstof.obj -MD -MP -MF misc/$(DEPDIR)/lib64_libmingwex_a-wcstof.Tpo -c -o misc/lib64_libmingwex_a-wcstof.obj `if test -f 'misc/wcstof.c'; then $(CYGPATH_W) 'misc/wcstof.c'; else $(CYGPATH_W) '$(srcdir)/misc/wcstof.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) misc/$(DEPDIR)/lib64_libmingwex_a-wcstof.Tpo misc/$(DEPDIR)/lib64_libmingwex_a-wcstof.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='misc/wcstof.c' object='misc/lib64_libmingwex_a-wcstof.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc/lib64_libmingwex_a-wcstof.obj `if test -f 'misc/wcstof.c'; then $(CYGPATH_W) 'misc/wcstof.c'; else $(CYGPATH_W) '$(srcdir)/misc/wcstof.c'; fi` + stdio/lib64_libmingwex_a-atoll.o: stdio/atoll.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stdio/lib64_libmingwex_a-atoll.o -MD -MP -MF stdio/$(DEPDIR)/lib64_libmingwex_a-atoll.Tpo -c -o stdio/lib64_libmingwex_a-atoll.o `test -f 'stdio/atoll.c' || echo '$(srcdir)/'`stdio/atoll.c @am__fastdepCC_TRUE@ $(am__mv) stdio/$(DEPDIR)/lib64_libmingwex_a-atoll.Tpo stdio/$(DEPDIR)/lib64_libmingwex_a-atoll.Po @@ -23579,20 +23593,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stdio/lib64_libmingwex_a-vwscanf.obj `if test -f 'stdio/vwscanf.c'; then $(CYGPATH_W) 'stdio/vwscanf.c'; else $(CYGPATH_W) '$(srcdir)/stdio/vwscanf.c'; fi` -stdio/lib64_libmingwex_a-wcstof.o: stdio/wcstof.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stdio/lib64_libmingwex_a-wcstof.o -MD -MP -MF stdio/$(DEPDIR)/lib64_libmingwex_a-wcstof.Tpo -c -o stdio/lib64_libmingwex_a-wcstof.o `test -f 'stdio/wcstof.c' || echo '$(srcdir)/'`stdio/wcstof.c -@am__fastdepCC_TRUE@ $(am__mv) stdio/$(DEPDIR)/lib64_libmingwex_a-wcstof.Tpo stdio/$(DEPDIR)/lib64_libmingwex_a-wcstof.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='stdio/wcstof.c' object='stdio/lib64_libmingwex_a-wcstof.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stdio/lib64_libmingwex_a-wcstof.o `test -f 'stdio/wcstof.c' || echo '$(srcdir)/'`stdio/wcstof.c - -stdio/lib64_libmingwex_a-wcstof.obj: stdio/wcstof.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stdio/lib64_libmingwex_a-wcstof.obj -MD -MP -MF stdio/$(DEPDIR)/lib64_libmingwex_a-wcstof.Tpo -c -o stdio/lib64_libmingwex_a-wcstof.obj `if test -f 'stdio/wcstof.c'; then $(CYGPATH_W) 'stdio/wcstof.c'; else $(CYGPATH_W) '$(srcdir)/stdio/wcstof.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) stdio/$(DEPDIR)/lib64_libmingwex_a-wcstof.Tpo stdio/$(DEPDIR)/lib64_libmingwex_a-wcstof.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='stdio/wcstof.c' object='stdio/lib64_libmingwex_a-wcstof.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stdio/lib64_libmingwex_a-wcstof.obj `if test -f 'stdio/wcstof.c'; then $(CYGPATH_W) 'stdio/wcstof.c'; else $(CYGPATH_W) '$(srcdir)/stdio/wcstof.c'; fi` - stdio/lib64_libmingwex_a-_wfindfirst64i32.o: stdio/_wfindfirst64i32.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stdio/lib64_libmingwex_a-_wfindfirst64i32.o -MD -MP -MF stdio/$(DEPDIR)/lib64_libmingwex_a-_wfindfirst64i32.Tpo -c -o stdio/lib64_libmingwex_a-_wfindfirst64i32.o `test -f 'stdio/_wfindfirst64i32.c' || echo '$(srcdir)/'`stdio/_wfindfirst64i32.c @am__fastdepCC_TRUE@ $(am__mv) stdio/$(DEPDIR)/lib64_libmingwex_a-_wfindfirst64i32.Tpo stdio/$(DEPDIR)/lib64_libmingwex_a-_wfindfirst64i32.Po
diff --git a/mingw-w64-crt/misc/mbrtowc.c b/mingw-w64-crt/misc/mbrtowc.c index 58e9b2e..d087e8a 100644 --- a/mingw-w64-crt/misc/mbrtowc.c +++ b/mingw-w64-crt/misc/mbrtowc.c
@@ -12,7 +12,7 @@ #include <errno.h> #include <windows.h> -static int +static int __MINGW_ATTRIB_NONNULL(1) __MINGW_ATTRIB_NONNULL(4) __mbrtowc_cp (wchar_t * __restrict__ pwc, const char * __restrict__ s, size_t n, mbstate_t* __restrict__ ps, const unsigned int cp, const unsigned int mb_max) @@ -20,8 +20,7 @@ union { mbstate_t val; char mbcs[4]; - } shift_state; - + } shift_state; /* Do the prelim checks */ if (s == NULL) @@ -41,54 +40,55 @@ *pwc = 0; return 0; } - + if (mb_max > 1) { if (shift_state.mbcs[0] != 0) { /* Complete the mb char with the trailing byte. */ - shift_state.mbcs[1] = *s; /* the second byte */ - if (MultiByteToWideChar(cp, MB_ERR_INVALID_CHARS, + shift_state.mbcs[1] = *s; /* the second byte */ + if (MultiByteToWideChar(cp, MB_ERR_INVALID_CHARS, shift_state.mbcs, 2, pwc, 1) == 0) { - /* An invalid trailing byte */ + /* An invalid trailing byte */ errno = EILSEQ; return -1; } - return 2; - } + return 2; + } else if (IsDBCSLeadByteEx (cp, *s)) - { - /* If told to translate one byte, just save the leadbyte - in *ps. */ + { + /* If told to translate one byte, just save the leadbyte + in *ps. */ if (n < 2) { - ((char*) ps)[0] = *s; + ((char*) ps)[0] = *s; return -2; } - /* Else translate the first two bytes */ - else if (MultiByteToWideChar (cp, MB_ERR_INVALID_CHARS, + /* Else translate the first two bytes */ + else if (MultiByteToWideChar (cp, MB_ERR_INVALID_CHARS, s, 2, pwc, 1) == 0) { errno = EILSEQ; return -1; } - return 2; - } + return 2; + } } - /* Fall through to single byte char */ + /* Fall through to single byte char */ if (cp == 0) *pwc = (wchar_t)(unsigned char)*s; - + else if (MultiByteToWideChar (cp, MB_ERR_INVALID_CHARS, s, 1, pwc, 1) == 0) { errno = EILSEQ; return -1; } + return 1; } @@ -116,7 +116,7 @@ const unsigned int cp = __mingw_get_codepage(); const unsigned int mb_max = MB_CUR_MAX; - if ( src == NULL || *src == NULL ) /* undefined behavior */ + if (src == NULL || *src == NULL) /* undefined behavior */ return 0; if (dst != NULL) @@ -127,14 +127,13 @@ > 0) { ++dst; - *src += ret; - n += ret; - } + *src += ret; + n += ret; + } if (n < len && ret == 0) - *src = (char *)NULL; + *src = (char *)NULL; } - else { wchar_t byte_bucket = 0; @@ -143,9 +142,9 @@ internal_ps, cp, mb_max)) > 0) { - *src += ret; - n += ret; - } + *src += ret; + n += ret; + } } return n; }
diff --git a/mingw-w64-crt/misc/wcrtomb.c b/mingw-w64-crt/misc/wcrtomb.c index e30baa0..5e0cb6a 100644 --- a/mingw-w64-crt/misc/wcrtomb.c +++ b/mingw-w64-crt/misc/wcrtomb.c
@@ -14,10 +14,10 @@ #include <windows.h> -static int /*__MINGW_ATTRIB_NONNULL(1)*/ +static int __MINGW_ATTRIB_NONNULL(1) __wcrtomb_cp (char *dst, wchar_t wc, const unsigned int cp, const unsigned int mb_max) -{ +{ if (cp == 0) { if (wc > 255) @@ -31,15 +31,15 @@ else { int invalid_char = 0; - - int size = WideCharToMultiByte(cp, 0 /* Is this correct flag? */, - &wc, 1, dst, mb_max, - NULL, &invalid_char); + + int size = WideCharToMultiByte (cp, 0 /* Is this correct flag? */, + &wc, 1, dst, mb_max, + NULL, &invalid_char); if (size == 0 || invalid_char) - { - errno = EILSEQ; - return -1; - } + { + errno = EILSEQ; + return -1; + } return size; } } @@ -48,7 +48,7 @@ wcrtomb (char *dst, wchar_t wc, mbstate_t * __UNUSED_PARAM (ps)) { char byte_bucket [MB_LEN_MAX]; - char* tmp_dst = dst ? dst : byte_bucket; + char* tmp_dst = dst ? dst : byte_bucket; return (size_t)__wcrtomb_cp (tmp_dst, wc, __mingw_get_codepage (), MB_CUR_MAX); } @@ -60,41 +60,41 @@ size_t n = 0; const unsigned int cp = __mingw_get_codepage(); const unsigned int mb_max = MB_CUR_MAX; - const wchar_t *pwc; + const wchar_t *pwc = *src; if (src == NULL || *src == NULL) /* undefined behavior */ - return 0; - pwc = *src; + return 0; + if (dst != NULL) { while (n < len) - { - if ((ret = __wcrtomb_cp (dst, *pwc, cp, mb_max)) <= 0) - return (size_t) -1; - n += ret; - dst += ret; - if (*(dst - 1) == '\0') + { + if ((ret = __wcrtomb_cp (dst, *pwc, cp, mb_max)) <= 0) + return (size_t) -1; + n += ret; + dst += ret; + if (*(dst - 1) == '\0') { *src = (wchar_t *) NULL; return (n - 1); } pwc++; - } + } *src = pwc; } else { char byte_bucket [MB_LEN_MAX]; while (n < len) - { - if ((ret = __wcrtomb_cp (byte_bucket, *pwc, cp, mb_max)) - <= 0) - return (size_t) -1; + { + if ((ret = __wcrtomb_cp (byte_bucket, *pwc, cp, mb_max)) <= 0) + return (size_t) -1; n += ret; if (byte_bucket [ret - 1] == '\0') return (n - 1); - pwc++; - } + pwc++; + } } + return n; }
diff --git a/mingw-w64-crt/misc/wcstof.c b/mingw-w64-crt/misc/wcstof.c new file mode 100644 index 0000000..c655544 --- /dev/null +++ b/mingw-w64-crt/misc/wcstof.c
@@ -0,0 +1,64 @@ +/* Wide char wrapper for strtof + * Revision history: + * 25 Aug 2006 Initial version. + * + * Contributor: Danny Smith <dannysmith@users.sourceforege.net> + */ + + /* This routine has been placed in the public domain.*/ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#include <locale.h> +#include <wchar.h> +#include <stdlib.h> +#include <string.h> +#include <mbstring.h> + +#include "mb_wc_common.h" + +float wcstof (const wchar_t * __restrict__ wcs, wchar_t ** __restrict__ wcse) +{ + char * cs; + char * cse; + unsigned int i; + float ret; + const unsigned int cp = __mingw_get_codepage(); + + /* Allocate enough room for (possibly) mb chars */ + cs = (char *) malloc ((wcslen(wcs)+1) * MB_CUR_MAX); + + if (cp == 0) /* C locale */ + { + for (i = 0; (wcs[i] != 0) && wcs[i] <= 255; i++) + cs[i] = (char) wcs[i]; + cs[i] = '\0'; + } + else + { + int nbytes = -1; + int mb_len = 0; + /* loop through till we hit null or invalid character */ + for (i = 0; (wcs[i] != 0) && (nbytes != 0); i++) + { + nbytes = WideCharToMultiByte(cp, WC_COMPOSITECHECK | WC_SEPCHARS, + wcs + i, 1, cs + mb_len, MB_CUR_MAX, + NULL, NULL); + mb_len += nbytes; + } + cs[mb_len] = '\0'; + } + + ret = strtof (cs, &cse); + + if (wcse) + { + /* Make sure temp mbstring cs has 0 at cse. */ + *cse = '\0'; + i = _mbslen ((unsigned char*) cs); /* Number of chars, not bytes */ + *wcse = (wchar_t *) wcs + i; + } + free (cs); + + return ret; +}
diff --git a/mingw-w64-crt/misc/wcstold.c b/mingw-w64-crt/misc/wcstold.c index 79ec948..68f2a4b 100644 --- a/mingw-w64-crt/misc/wcstold.c +++ b/mingw-w64-crt/misc/wcstold.c
@@ -6,6 +6,7 @@ /* Wide char wrapper for strtold * Revision history: * 6 Nov 2002 Initial version. + * 25 Aug 2006 Don't use strtold internal functions. * * Contributor: Danny Smith <dannysmith@users.sourceforege.net> */ @@ -20,32 +21,25 @@ #include <wchar.h> #include <stdlib.h> #include <string.h> +#include <mbstring.h> + #include "mb_wc_common.h" -extern int __asctoe64(const char * __restrict__ ss, - short unsigned int * __restrict__ y); - - long double wcstold (const wchar_t * __restrict__ wcs, wchar_t ** __restrict__ wcse) { char * cs; - int i; - int lenldstr; - union - { - unsigned short int us[6]; - long double ld; - } xx; + char * cse; + unsigned int i; + long double ret; + const unsigned int cp = __mingw_get_codepage(); - unsigned int cp = __mingw_get_codepage(); - /* Allocate enough room for (possibly) mb chars */ cs = (char *) malloc ((wcslen(wcs)+1) * MB_CUR_MAX); if (cp == 0) /* C locale */ { for (i = 0; (wcs[i] != 0) && wcs[i] <= 255; i++) - cs[i] = (char) wcs[i]; + cs[i] = (char) wcs[i]; cs[i] = '\0'; } else @@ -55,16 +49,24 @@ /* loop through till we hit null or invalid character */ for (i = 0; (wcs[i] != 0) && (nbytes != 0); i++) { - nbytes = WideCharToMultiByte(cp, WC_COMPOSITECHECK | WC_SEPCHARS, + nbytes = WideCharToMultiByte(cp, WC_COMPOSITECHECK | WC_SEPCHARS, wcs + i, 1, cs + mb_len, MB_CUR_MAX, NULL, NULL); mb_len += nbytes; } cs[mb_len] = '\0'; } - lenldstr = __asctoe64( cs, xx.us); - free (cs); + + ret = strtold (cs, &cse); + if (wcse) - *wcse = (wchar_t*) wcs + lenldstr; - return xx.ld; + { + /* Make sure temp mbstring has 0 at cse. */ + *cse = '\0'; + i = _mbslen ((unsigned char*) cs); /* Number of chars, not bytes */ + *wcse = (wchar_t *) wcs + i; + } + free (cs); + + return ret; }
diff --git a/mingw-w64-crt/misc/wctob.c b/mingw-w64-crt/misc/wctob.c index 2f548fc..eaead9f 100644 --- a/mingw-w64-crt/misc/wctob.c +++ b/mingw-w64-crt/misc/wctob.c
@@ -22,7 +22,8 @@ if (!WideCharToMultiByte (__mingw_get_codepage(), 0 /* Is this correct flag? */, &w, 1, &c, 1, NULL, &invalid_char) - || invalid_char) + || invalid_char) return EOF; + return (int) c; }
diff --git a/mingw-w64-crt/stdio/wcstof.c b/mingw-w64-crt/stdio/wcstof.c deleted file mode 100644 index 011d3dc..0000000 --- a/mingw-w64-crt/stdio/wcstof.c +++ /dev/null
@@ -1,11 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#include <wchar.h> - -float wcstof( const wchar_t *nptr, wchar_t **endptr) -{ - return (wcstod(nptr, endptr)); -}