summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/dcrt0.cc2
-rw-r--r--winsup/cygwin/miscfuncs.cc2
3 files changed, 7 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f82fcf830..bd7761fcd 100644
--- 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 1c5464f92..0398388df 100644
--- 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 aa922d703..e1b3a918b 100644
--- 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;