* dcrt0.cc (insert_file): Eliminate unused parameter.

(build_argv): Ditto.
* exceptions.cc (stack): Eliminate unused parameters.
(stackdump): Ditto.
(cygwin_stackdump): Reflect above changes.
(sig_handle): Ditto.
* fhandler.cc (fhandler_base::set_inheritance): Use kludge to avoid unused
parameter warning.

4 files changed, 67 insertions, 51 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f4bda5579..e2e6116a6 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,14 @@
+Sat May  6 23:22:25 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* dcrt0.cc (insert_file): Eliminate unused parameter.
+	(build_argv): Ditto.
+	* exceptions.cc (stack): Eliminate unused parameters.
+	(stackdump): Ditto.
+	(cygwin_stackdump): Reflect above changes.
+	(sig_handle): Ditto.
+	* fhandler.cc (fhandler_base::set_inheritance): Use kludge to avoid
+	unused parameter warning.
+
 2000-05-06  Mumit Khan  <khan@xraylith.wisc.edu>
 
 	* include/wchar.h (wcscmp, wcslen): Fix prototypes.
@@ -25,41 +36,41 @@ Wed May  3 21:54:11 2000  Christopher Faylor <cgf@cygnus.com>
 
 Wed May  3 18:07:00 2000  Corinna Vinschen <corinna@vinschen.de>
 
-        * errno.cc (errmap): Map ERROR_BAD_NETPATH to new errno ENOSHARE.
-        (_sys_errlist): Add entry for ENOSHARE.
-        (strerror): Add case for ENOSHARE.
-        * syscalls.cc (stat_worker): Check for errno ENOSHARE.
+	* errno.cc (errmap): Map ERROR_BAD_NETPATH to new errno ENOSHARE.
+	(_sys_errlist): Add entry for ENOSHARE.
+	(strerror): Add case for ENOSHARE.
+	* syscalls.cc (stat_worker): Check for errno ENOSHARE.
 
 Wed May  3 17:28:00 2000  Corinna Vinschen <corinna@vinschen.de>
 
-        * Makefile.in: Add dependencies for fhandler_random.o
-        * fhandler.h: Add device type FH_RANDOM. Add class
-        fhandler_dev_random.
-        * fhandler_random.cc: New file. Implementation of
-        fhandler_dev_random.
-        * hinfo.cc (build_fhandler): Add case for FH_RANDOM.
-        * path.cc: Add device names for random devices to
-        windows_device_names.
-        (get_device_number): Add if branch for random devices.
-        (win32_device_name): Add device name generation for
-        random devices.
-        winsup.h: Include <wincrypt.h>.
+	* Makefile.in: Add dependencies for fhandler_random.o
+	* fhandler.h: Add device type FH_RANDOM. Add class
+	fhandler_dev_random.
+	* fhandler_random.cc: New file. Implementation of
+	fhandler_dev_random.
+	* hinfo.cc (build_fhandler): Add case for FH_RANDOM.
+	* path.cc: Add device names for random devices to
+	windows_device_names.
+	(get_device_number): Add if branch for random devices.
+	(win32_device_name): Add device name generation for
+	random devices.
+	winsup.h: Include <wincrypt.h>.
 
 2000-05-02  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
 
-	* path.cc (mount_info::conv_to_win32_path): Previous patch 
+	* path.cc (mount_info::conv_to_win32_path): Previous patch
 	failed to set flags on a win32 path.
 
 Tue May  2 11:34:00 2000  Corinna Vinschen <corinna@vinschen.de>
 
-        * security.cc (read_sd): Return 1 on success because we
-        can't rely on the returned SD size from GetFileSecurity.
+	* security.cc (read_sd): Return 1 on success because we
+	can't rely on the returned SD size from GetFileSecurity.
 
 Tue May  2  2:22:00 2000  Corinna Vinschen <corinna@vinschen.de>
 
-        * dcrt0.cc: Add dynamic load code for `OemToCharA' from user32.dll.
-        * security.cc (read_sd): Call `OemToCharA' to make
-        `GetFileSecurity' happy on filenames with umlauts.
+	* dcrt0.cc: Add dynamic load code for `OemToCharA' from user32.dll.
+	* security.cc (read_sd): Call `OemToCharA' to make
+	`GetFileSecurity' happy on filenames with umlauts.
 
 Wed Apr 26 23:23:23 2000  Christopher Faylor <cgf@cygnus.com>
 
@@ -74,8 +85,8 @@ Wed Apr 26 23:23:23 2000  Christopher Faylor <cgf@cygnus.com>
 	
 Wed Apr 26 16:20:00 2000  Corinna Vinschen <corinna@vinschen.de>
 
-        * syscalls.cc (stat_worker): Previous patch could succeed
-        in stating a non-existant file.
+	* syscalls.cc (stat_worker): Previous patch could succeed
+	in stating a non-existant file.
 
 Wed Apr 26 01:07:16 2000  Christopher Faylor <cgf@cygnus.com>
 
@@ -112,26 +123,26 @@ Tue Apr 25 16:50:54 2000  Christopher Faylor <cgf@cygnus.com>
 
 Thu Apr 25 21:35:00 2000  Corinna Vinschen <corinna@vinschen.de>
 
-        * syscalls.cc (stat_worker): Previous patch failed to stat
-        each drives root dir on 9X.
+	* syscalls.cc (stat_worker): Previous patch failed to stat
+	each drives root dir on 9X.
 
 Thu Apr 25 16:37:00 2000  Corinna Vinschen <corinna@vinschen.de>
 
-        * fhandler.cc (fhandler_disk_file::open): Check for allow_ntsec
-        when determining exec flag.
-        * path.cc (symlink_info::check): Remove call to get_file_attribute().
-        * security.cc (read_sd): Rename, ditto for variables to conform
-        to common naming convention. Use GetFileSecurity() instead of
-        BackupRead() to avoid permission problems when reading ACLs.
-        (write_sd): Same renaming as for read_sd().
-        (alloc_sd): Change default permissions according to Linux permissions
-        for group and world when write permission is set.
-        * syscalls.cc (stat_worker): Avoid different permission problems
-        when requesting file informations.
+	* fhandler.cc (fhandler_disk_file::open): Check for allow_ntsec
+	when determining exec flag.
+	* path.cc (symlink_info::check): Remove call to get_file_attribute().
+	* security.cc (read_sd): Rename, ditto for variables to conform
+	to common naming convention. Use GetFileSecurity() instead of
+	BackupRead() to avoid permission problems when reading ACLs.
+	(write_sd): Same renaming as for read_sd().
+	(alloc_sd): Change default permissions according to Linux permissions
+	for group and world when write permission is set.
+	* syscalls.cc (stat_worker): Avoid different permission problems
+	when requesting file informations.
 
 Thu Apr 25 10:50:00 2000  Corinna Vinschen <corinna@vinschen.de>
 
-        * net.cc: Avoid a warning in declaration inet_network.
+	* net.cc: Avoid a warning in declaration inet_network.
 
 Mon Apr 24 17:38:25 2000  Thorsten Otto <t.otto@germanynet.de>
 
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index c0107bdac..8c19cceea 100644
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -185,7 +185,7 @@ host_dependent_constants::init ()
  * -@foo and not the contents of foo.
  */
 static int __stdcall
-insert_file (char *name, char *&cmd, int& alloc_cmd)
+insert_file (char *name, char *&cmd)
 {
   HANDLE f;
   DWORD size;
@@ -424,7 +424,7 @@ build_argv (char *cmd, char **&argv, int &argc, int winshell)
 	{
 	  if (++nesting > MAX_AT_FILE_LEVEL)
 	    api_fatal ("Too many levels of nesting for %s", word);
-	  if (insert_file (word, cmd, alloc_cmd))
+	  if (insert_file (word, cmd))
 	      continue;			// There's new stuff in cmd now
 	}
 
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index dea040659..4720d8e6e 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -269,9 +269,9 @@ stack_info::walk ()
   return 1;
 }
 
-/* Dump the stack using either the old method or the new Win32 API method */
+/* Dump the stack */
 void
-stack (HANDLE hproc, HANDLE hthread, CONTEXT *cx)
+stack (CONTEXT *cx)
 {
   int i;
 
@@ -295,10 +295,8 @@ cygwin_stackdump()
 {
   CONTEXT c;
   c.ContextFlags = CONTEXT_FULL;
-  HANDLE h1 = GetCurrentProcess ();
-  HANDLE h2 = GetCurrentThread ();
-  GetThreadContext (h2, &c);
-  stack(h1, h2, &c);
+  GetThreadContext (GetCurrentThread (), &c);
+  stack(&c);
 }
 
 static int NO_COPY keep_looping = 0;
@@ -360,7 +358,7 @@ try_to_debug ()
 }
 
 void
-stackdump (HANDLE hproc, HANDLE hthread, EXCEPTION_RECORD *e, CONTEXT *in)
+stackdump (EXCEPTION_RECORD *e, CONTEXT *in)
 {
   char *p;
   if (myself->progname[0])
@@ -382,7 +380,7 @@ stackdump (HANDLE hproc, HANDLE hthread, EXCEPTION_RECORD *e, CONTEXT *in)
     }
   if (e)
     exception (e, in);
-  stack (hproc, hthread, in);
+  stack (in);
 }
 
 /* Main exception handler. */
@@ -487,7 +485,7 @@ handle_exceptions (EXCEPTION_RECORD *e, void *, CONTEXT *in, void *)
 	  HANDLE hthread;
 	  DuplicateHandle (hMainProc, GetCurrentThread (),
 			   hMainProc, &hthread, 0, FALSE, DUPLICATE_SAME_ACCESS);
-	  stackdump (hMainProc, hthread, e, in);
+	  stackdump (e, in);
 	}
       try_to_debug ();
       really_exit (EXIT_SIGNAL | sig);
@@ -925,7 +923,7 @@ done:
 exit_sig:
   if (sig == SIGQUIT || sig == SIGABRT)
     {
-      stackdump (NULL, NULL, NULL, NULL);
+      stackdump (NULL, NULL);
       try_to_debug ();
     }
   sigproc_printf ("signal %d, about to call do_exit", sig);
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index ef4281c7c..45064c04d 100644
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -1428,8 +1428,15 @@ fhandler_pipe::lseek (off_t offset, int whence)
   return -1;
 }
 
+#ifdef DEBUGGING
+#define nameparm name
+#else
+#define nameparm
+#endif
+
 void
-fhandler_base::set_inheritance (HANDLE &h, int not_inheriting, const char *name)
+fhandler_base::set_inheritance (HANDLE &h, int not_inheriting, const char *nameparm)
+#undef nameparm
 {
   HANDLE newh;