From 7b9e380f0362aad5dfa3e06e60fd6d06549e2306 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Thu, 11 Sep 2008 04:34:24 +0000
Subject: * cygheap.cc (creturn): Reorganize to avoid a new compiler
 warning/error. * dtable.cc (handle_to_fn): Ditto. * fhandler_console.cc
 (fhandler_console::read): Ditto. (fhandler_console::scroll_screen): Ditto.
 (dev_console::set_color): Ditto. * fhandler_dsp.cc (fhandler_dev_dsp::write):
 Ditto. (fhandler_dev_dsp::read): Ditto. * fhandler_tape.cc
 (mtinfo_drive::get_status): Ditto. * hookapi.cc (find_first_notloaded_dll):
 Ditto. * mmap.cc (msync): Ditto. * pipe.cc (pipesync::pipesync): Ditto. *
 sec_acl.cc (getace): Ditto. * sec_auth.cc (create_token): Ditto. (lsaauth):
 Ditto. * select.cc (peek_pipe): Ditto. * spawn.cc (av::fixup): Ditto. *
 syscalls.cc (popen): Ditto. * tty.cc (tty::init_session): Ditto. * uinfo.cc
 (pwdgrp::load): Ditto. * fhandler.cc (fhandler_base::setup_overlapped):
 Ditto. (fhandler_base::wait_overlapped): Rename second use of res variable to
 wres or errors are not returned correctly. * dcrt0.cc: Remove obsolete
 variable. * dll_init.cc (release_upto): Fix typo involving incorrect use of
 '|'. * fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Avoid a
 compiler warning regarding coercing type-punned variables.
 (fhandler_base::fstat_by_name): Ditto.  fhandler_fifo.cc
 (fhandler_fifo::open_nonserver): Fix = vs.  == typo. (fhandler_fifo::wait):
 Add all conditions to switch statement to avoid a compiler warning. *
 fhandler_process.cc: Avoid unneeded initialization of variables to zero.
 (fhandler_socket::listen): Add braces around initializer. * flock.cc
 (inode_t::get_all_locks_list): Reorganize to avoid a compiler warning.  Fix
 problem with EWOULDBLOCK error return. * path.cc (GUID_shortcut): Use braces
 around struct initializer. (cygwin_conv_path): Reorganize to avoid a compiler
 warning. * random.cc (dummy): Mark variable as volatile to avoid a "used
 uninitialized" warning. * libc/getopt.c: Mark some variables as dllexport
 although gcc doesn't seem to do the right thing with them. *
 libc/minires-os-if.c (get_registry_dns_items): Coerce some function arguments
 to avoid a compiler warning.

---
 winsup/cygwin/fhandler_dsp.cc | 68 ++++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 33 deletions(-)

(limited to 'winsup/cygwin/fhandler_dsp.cc')

diff --git a/winsup/cygwin/fhandler_dsp.cc b/winsup/cygwin/fhandler_dsp.cc
index ed5ddad8a..1927a9b28 100644
--- a/winsup/cygwin/fhandler_dsp.cc
+++ b/winsup/cygwin/fhandler_dsp.cc
@@ -1007,24 +1007,25 @@ fhandler_dev_dsp::write (const void *ptr, size_t len)
   int len_s = len;
   const char *ptr_s = static_cast <const char *> (ptr);
 
-  if (!audio_out_)
-    if (IS_WRITE ())
-      {
-	debug_printf ("Allocating");
-	if (!(audio_out_ = new Audio_out))
-	  return -1;
+  if (audio_out_)
+    /* nothing to do */;
+  else if (IS_WRITE ())
+    {
+      debug_printf ("Allocating");
+      if (!(audio_out_ = new Audio_out))
+	return -1;
 
-	/* check for wave file & get parameters & skip header if possible. */
+      /* check for wave file & get parameters & skip header if possible. */
 
-	if (audio_out_->parsewav (ptr_s, len_s,
-				  audiofreq_, audiobits_, audiochannels_))
-	  debug_printf ("=> ptr_s=%08x len_s=%d", ptr_s, len_s);
-      }
-    else
-      {
-	set_errno (EBADF); // device was opened for read?
-	return -1;
-      }
+      if (audio_out_->parsewav (ptr_s, len_s,
+				audiofreq_, audiobits_, audiochannels_))
+	debug_printf ("=> ptr_s=%08x len_s=%d", ptr_s, len_s);
+    }
+  else
+    {
+      set_errno (EBADF); // device was opened for read?
+      return -1;
+    }
 
   /* Open audio device properly with callbacks.
      Private parameters were set in call to parsewav.
@@ -1046,23 +1047,24 @@ fhandler_dev_dsp::read (void *ptr, size_t& len)
   if ((fhandler_dev_dsp *) archetype != this)
     return ((fhandler_dev_dsp *)archetype)->read(ptr, len);
 
-  if (!audio_in_)
-    if (IS_READ ())
-      {
-	debug_printf ("Allocating");
-	if (!(audio_in_ = new Audio_in))
-	  {
-	    len = (size_t)-1;
-	    return;
-	  }
-	audio_in_->setconvert (audioformat_);
-      }
-    else
-      {
-	len = (size_t)-1;
-	set_errno (EBADF); // device was opened for write?
-	return;
-      }
+  if (audio_in_)
+    /* nothing to do */;
+  else if (IS_READ ())
+    {
+      debug_printf ("Allocating");
+      if (!(audio_in_ = new Audio_in))
+	{
+	  len = (size_t)-1;
+	  return;
+	}
+      audio_in_->setconvert (audioformat_);
+    }
+  else
+    {
+      len = (size_t)-1;
+      set_errno (EBADF); // device was opened for write?
+      return;
+    }
 
   /* Open audio device properly with callbacks.
      This is a noop when there are successive reads in the same process */
-- 
cgit v1.2.3