* dcrt0.cc (dll_crt0_1): Fix typo in call to sys_wcstombs.

	* miscfuncs.cc (next_char): Initialize ret to keep gcc happy.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f82fcf830008104f6a5a9a2c6b39df45c7130e42..bd7761fcd5327ee24f1d30ed11c06f6cf57da67a 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-11  Corinna Vinschen  <corinna@vinschen.de>
+
+       * dcrt0.cc (dll_crt0_1): Fix typo in call to sys_wcstombs.
+       * miscfuncs.cc (next_char): Initialize ret to keep gcc happy.
+
 2008-02-10  Corinna Vinschen  <corinna@vinschen.de>
 
        * Makefile.in (DLL_OFILES): Add ntea.o.

diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 1c5464f928481c72045adbfa8999d8f540e6c621..0398388df68d5d5c7a8e6d05fb6636949e3ff40e 100644 (file)
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -857,7 +857,7 @@ dll_crt0_1 (void *)
   if (!__argc)
     {
       PWCHAR wline = GetCommandLineW ();
-      size_t size = sys_wcstombs (NULL, size, wline);
+      size_t size = sys_wcstombs (NULL, 0, wline);
       char *line = (char *) alloca (size);
       sys_wcstombs (line, size, wline);
 

diff --git a/winsup/cygwin/miscfuncs.cc b/winsup/cygwin/miscfuncs.cc
index aa922d703e03fc3110be6446db5e13d6c6b17f9a..e1b3a918b01446a68edfd4812289eb5f1bf25d55 100644 (file)
--- a/winsup/cygwin/miscfuncs.cc
+++ b/winsup/cygwin/miscfuncs.cc
@@ -236,7 +236,7 @@ is_cp_multibyte (UINT cp)
 const unsigned char *
 next_char (UINT cp, const unsigned char *str, const unsigned char *end)
 {
-  const unsigned char *ret;
+  const unsigned char *ret = NULL;
 
   if (str >= end)
     return end;