* fhandler_dsp.cc (fhandler_dev_dsp::Audio_out::init): Fix non-ISO

	expression.
	* fhandler_floppy.cc (fhandler_dev_floppy::open): Remove unused
	variable.
	* fhandler_proc.cc (format_proc_meminfo): Fix compiler warning.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f41a66f..2c2ade4 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,11 @@
+2004-07-19  Corinna Vinschen  <corinna@vinschen.de>
+
+       * fhandler_dsp.cc (fhandler_dev_dsp::Audio_out::init): Fix non-ISO
+       expression.
+       * fhandler_floppy.cc (fhandler_dev_floppy::open): Remove unused
+       variable.
+       * fhandler_proc.cc (format_proc_meminfo): Fix compiler warning.
+
 2004-07-16  Christopher Faylor  <cgf@timesys.com>
 
        * pinfo.cc (pinfo::init): Guard against MapViewOfFileEx failure.

diff --git a/winsup/cygwin/fhandler_dsp.cc b/winsup/cygwin/fhandler_dsp.cc
index 7044c66..85237a4 100644 (file)
--- a/winsup/cygwin/fhandler_dsp.cc
+++ b/winsup/cygwin/fhandler_dsp.cc
@@ -475,7 +475,7 @@ fhandler_dev_dsp::Audio_out::init (unsigned blockSize)
   for (i = 0; i < MAX_BLOCKS; i++)
     {
       wavehdr_[i].lpData = &bigwavebuffer_[i * blockSize];
-      (int)wavehdr_[i].dwUser = blockSize;
+      wavehdr_[i].dwUser = (int) blockSize;
       if (!Qapp2app_->send (&wavehdr_[i]))
        {
          debug_printf ("Internal Error i=%d", i);

diff --git a/winsup/cygwin/fhandler_floppy.cc b/winsup/cygwin/fhandler_floppy.cc
index 88204db..3c8870e 100644 (file)
--- a/winsup/cygwin/fhandler_floppy.cc
+++ b/winsup/cygwin/fhandler_floppy.cc
@@ -69,7 +69,6 @@ fhandler_dev_floppy::open (int flags, mode_t)
 _off64_t
 fhandler_dev_floppy::lseek (_off64_t offset, int whence)
 {
-  int ret;
   char buf[512];
   _off64_t drive_size = 0;
   _off64_t lloffset = offset;

diff --git a/winsup/cygwin/fhandler_proc.cc b/winsup/cygwin/fhandler_proc.cc
index 20b6633..8b7fec4 100644 (file)
--- a/winsup/cygwin/fhandler_proc.cc
+++ b/winsup/cygwin/fhandler_proc.cc
@@ -392,7 +392,7 @@ format_proc_meminfo (char *destbuf, size_t maxsize)
   mem_free = memory_status.dwAvailPhys;
   PSYSTEM_PAGEFILE_INFORMATION spi = NULL;
   ULONG size = 512;
-  NTSTATUS ret;
+  NTSTATUS ret = STATUS_SUCCESS;
   spi = (PSYSTEM_PAGEFILE_INFORMATION) malloc (size);
   if (spi)
     {