* 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.

1 files changed, 13 insertions, 11 deletions

diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 076e233..11cf706 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -261,7 +261,7 @@ fhandler_console::read (void *pv, size_t& buflen)
 	  /* allow manual switching to/from raw mode via ctrl-alt-scrolllock */
 	  if (input_rec.Event.KeyEvent.bKeyDown &&
 	      virtual_key_code == VK_SCROLL &&
-	      control_key_state & (LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED) == LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED
+	      ((control_key_state & (LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED)) == (LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED))
 	    )
 	    {
 	      set_raw_win32_keyboard_mode (!dev_state->raw_win32_keyboard_mode);
@@ -568,11 +568,12 @@ fhandler_console::scroll_screen (int x1, int y1, int x2, int y2, int xn, int yn)
   /* ScrollConsoleScreenBuffer on Windows 95 is buggy - when scroll distance
    * is more than half of screen, filling doesn't work as expected */
 
-  if (sr1.Top != sr1.Bottom)
-    if (dest.Y <= sr1.Top)	/* forward scroll */
-      clear_screen (0, 1 + dest.Y + sr1.Bottom - sr1.Top, sr2.Right, sr2.Bottom);
-    else			/* reverse scroll */
-      clear_screen (0, sr1.Top, sr2.Right, dest.Y - 1);
+  if (sr1.Top == sr1.Bottom)
+    /* nothing to do */;
+  else if (dest.Y <= sr1.Top)	/* forward scroll */
+    clear_screen (0, 1 + dest.Y + sr1.Bottom - sr1.Top, sr2.Right, sr2.Bottom);
+  else			/* reverse scroll */
+    clear_screen (0, sr1.Top, sr2.Right, dest.Y - 1);
 }
 
 int
@@ -895,12 +896,13 @@ dev_console::set_color (HANDLE h)
     win_bg |= BACKGROUND_INTENSITY;
   if (intensity == INTENSITY_INVISIBLE)
     win_fg = win_bg;
-  else if (intensity == INTENSITY_BOLD)
+  else if (intensity != INTENSITY_BOLD)
+    /* nothing to do */;
     /* apply foreground intensity only in non-reverse mode! */
-    if (reverse)
-      win_bg |= BACKGROUND_INTENSITY;
-    else
-      win_fg |= FOREGROUND_INTENSITY;
+  else if (reverse)
+    win_bg |= BACKGROUND_INTENSITY;
+  else
+    win_fg |= FOREGROUND_INTENSITY;
 
   current_win32_attr = win_fg | win_bg;
   if (h)