From bc2c51140c453eff3a6d6bf6e0335f902973a472 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 19 Jul 2004 13:13:48 +0000 Subject: [PATCH] * 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. --- winsup/cygwin/ChangeLog | 8 ++++++++ winsup/cygwin/fhandler_dsp.cc | 2 +- winsup/cygwin/fhandler_floppy.cc | 1 - winsup/cygwin/fhandler_proc.cc | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index f41a66f3c..2c2ade497 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,11 @@ +2004-07-19 Corinna Vinschen + + * 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 * pinfo.cc (pinfo::init): Guard against MapViewOfFileEx failure. diff --git a/winsup/cygwin/fhandler_dsp.cc b/winsup/cygwin/fhandler_dsp.cc index 7044c6686..85237a403 100644 --- 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 88204dbbd..3c8870ed4 100644 --- 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 20b6633ea..8b7fec4e7 100644 --- 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) {