* 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, 21 insertions, 21 deletions

diff --git a/winsup/cygwin/hookapi.cc b/winsup/cygwin/hookapi.cc
index 07101982c..7a13ee047 100644
--- a/winsup/cygwin/hookapi.cc
+++ b/winsup/cygwin/hookapi.cc
@@ -191,29 +191,29 @@ find_first_notloaded_dll (path_conv& pc)
   PIMAGE_NT_HEADERS pExeNTHdr;
   pExeNTHdr = PEHeaderFromHModule (hm);
 
-  if (!pExeNTHdr)
-    goto out;
-
-  DWORD importRVA;
-  importRVA = pExeNTHdr->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress;
-  if (!importRVA)
-    goto out;
-
-  long delta = rvadelta (pExeNTHdr, importRVA);
-
-  // Convert imports RVA to a usable pointer
-  PIMAGE_IMPORT_DESCRIPTOR pdfirst;
-  pdfirst = rva (PIMAGE_IMPORT_DESCRIPTOR, hm, importRVA - delta);
-
-  // Iterate through each import descriptor, and redirect if appropriate
-  for (PIMAGE_IMPORT_DESCRIPTOR pd = pdfirst; pd->FirstThunk; pd++)
+  if (pExeNTHdr)
     {
-      const char *lib = rva (PSTR, hm, pd->Name - delta);
-      if (!LoadLibraryEx (lib, NULL, DONT_RESOLVE_DLL_REFERENCES
-			             | LOAD_LIBRARY_AS_DATAFILE))
+      DWORD importRVA;
+      importRVA = pExeNTHdr->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress;
+      if (importRVA)
 	{
-	  static char buf[NT_MAX_PATH];
-	  res = strcpy (buf, lib);
+	  long delta = rvadelta (pExeNTHdr, importRVA);
+
+	  // Convert imports RVA to a usable pointer
+	  PIMAGE_IMPORT_DESCRIPTOR pdfirst;
+	  pdfirst = rva (PIMAGE_IMPORT_DESCRIPTOR, hm, importRVA - delta);
+
+	  // Iterate through each import descriptor, and redirect if appropriate
+	  for (PIMAGE_IMPORT_DESCRIPTOR pd = pdfirst; pd->FirstThunk; pd++)
+	    {
+	      const char *lib = rva (PSTR, hm, pd->Name - delta);
+	      if (!LoadLibraryEx (lib, NULL, DONT_RESOLVE_DLL_REFERENCES
+					     | LOAD_LIBRARY_AS_DATAFILE))
+		{
+		  static char buf[NT_MAX_PATH];
+		  res = strcpy (buf, lib);
+		}
+	    }
 	}
     }