From cc38b4967d7ab636dd0fb86abd8d5e589d44c767 Mon Sep 17 00:00:00 2001
From: cgf <cgf>
Date: Wed, 14 Sep 2005 14:27:51 +0000
Subject: [PATCH] Remove some more unneeded 'return;'s throughout.

---
 winsup/cygwin/ChangeLog             | 4 ++++
 winsup/cygwin/fhandler_disk_file.cc | 1 -
 winsup/cygwin/fhandler_dsp.cc       | 1 -
 winsup/cygwin/fhandler_mem.cc       | 1 -
 winsup/cygwin/fhandler_raw.cc       | 1 -
 winsup/cygwin/fhandler_registry.cc  | 1 -
 winsup/cygwin/fhandler_serial.cc    | 1 -
 winsup/cygwin/fhandler_tty.cc       | 2 --
 winsup/cygwin/fhandler_virtual.cc   | 2 --
 winsup/cygwin/fhandler_windows.cc   | 1 -
 winsup/cygwin/fhandler_zero.cc      | 1 -
 winsup/cygwin/grp.cc                | 1 -
 winsup/cygwin/malloc_wrapper.cc     | 2 --
 winsup/cygwin/passwd.cc             | 1 -
 winsup/cygwin/pipe.cc               | 1 -
 winsup/cygwin/security.cc           | 3 ---
 winsup/cygwin/times.cc              | 1 -
 winsup/cygwin/uinfo.cc              | 3 ---
 18 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 1a52198838..60c3fb3191 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,9 @@
 2005-09-14  Christopher Faylor  <cgf@timesys.com>
 
+	Remove some more unneeded 'return;'s throughout. 
+
+2005-09-14  Christopher Faylor  <cgf@timesys.com>
+
 	* sigproc.h: Protect declaration so that it only happens when
 	__INSIDE_CYGWIN__.
 
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index de786d0889..45d92dc232 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -1553,7 +1553,6 @@ fhandler_cygdrive::rewinddir (DIR *dir)
 {
   pdrive = get_win32_name ();
   dir->__d_position = 0;
-  return;
 }
 
 int
diff --git a/winsup/cygwin/fhandler_dsp.cc b/winsup/cygwin/fhandler_dsp.cc
index c3e185af08..3813eeef91 100644
--- a/winsup/cygwin/fhandler_dsp.cc
+++ b/winsup/cygwin/fhandler_dsp.cc
@@ -1077,7 +1077,6 @@ fhandler_dev_dsp::read (void *ptr, size_t& len)
     }
 
   audio_in_->read ((char *)ptr, (int&)len);
-  return;
 }
 
 _off64_t
diff --git a/winsup/cygwin/fhandler_mem.cc b/winsup/cygwin/fhandler_mem.cc
index 53c5186223..58d67858d2 100644
--- a/winsup/cygwin/fhandler_mem.cc
+++ b/winsup/cygwin/fhandler_mem.cc
@@ -217,7 +217,6 @@ fhandler_dev_mem::read (void *ptr, size_t& ulen)
     }
 
   pos += ulen;
-  return;
 }
 
 _off64_t
diff --git a/winsup/cygwin/fhandler_raw.cc b/winsup/cygwin/fhandler_raw.cc
index 5b2bb6388f..24525ef40b 100644
--- a/winsup/cygwin/fhandler_raw.cc
+++ b/winsup/cygwin/fhandler_raw.cc
@@ -267,7 +267,6 @@ fhandler_dev_raw::raw_read (void *ptr, size_t& ulen)
 
 err:
   ulen = (size_t) -1;
-  return;
 }
 
 int
diff --git a/winsup/cygwin/fhandler_registry.cc b/winsup/cygwin/fhandler_registry.cc
index 37bb63983f..7c253e03ee 100644
--- a/winsup/cygwin/fhandler_registry.cc
+++ b/winsup/cygwin/fhandler_registry.cc
@@ -377,7 +377,6 @@ fhandler_registry::rewinddir (DIR * dir)
     }
   dir->__d_position = 0;
   dir->__flags = dirent_saw_dot | dirent_saw_dot_dot;
-  return;
 }
 
 int
diff --git a/winsup/cygwin/fhandler_serial.cc b/winsup/cygwin/fhandler_serial.cc
index dcf4206c5a..785c8b69a8 100644
--- a/winsup/cygwin/fhandler_serial.cc
+++ b/winsup/cygwin/fhandler_serial.cc
@@ -1066,7 +1066,6 @@ fhandler_serial::fixup_after_exec ()
 {
   overlapped_setup ();
   debug_printf ("io_status.hEvent %p", io_status.hEvent);
-  return;
 }
 
 int
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index ce2bd5db8d..5016c5a4fd 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -912,7 +912,6 @@ fhandler_tty_slave::read (void *ptr, size_t& len)
     }
   termios_printf ("%d=read(%x, %d)", totalread, ptr, len);
   len = (size_t) totalread;
-  return;
 }
 
 int
@@ -1283,7 +1282,6 @@ void __stdcall
 fhandler_pty_master::read (void *ptr, size_t& len)
 {
   len = (size_t) process_slave_output ((char *) ptr, len, pktmode);
-  return;
 }
 
 int
diff --git a/winsup/cygwin/fhandler_virtual.cc b/winsup/cygwin/fhandler_virtual.cc
index 494e81c581..414d5c83f3 100644
--- a/winsup/cygwin/fhandler_virtual.cc
+++ b/winsup/cygwin/fhandler_virtual.cc
@@ -103,7 +103,6 @@ fhandler_virtual::seekdir (DIR * dir, _off64_t loc)
 {
   dir->__flags |= dirent_saw_dot | dirent_saw_dot_dot;
   dir->__d_position = loc;
-  return;
 }
 
 void
@@ -111,7 +110,6 @@ fhandler_virtual::rewinddir (DIR * dir)
 {
   dir->__d_position = 0;
   dir->__flags |= dirent_saw_dot | dirent_saw_dot_dot;
-  return;
 }
 
 int
diff --git a/winsup/cygwin/fhandler_windows.cc b/winsup/cygwin/fhandler_windows.cc
index 1e6bf3db5b..8232450bb2 100644
--- a/winsup/cygwin/fhandler_windows.cc
+++ b/winsup/cygwin/fhandler_windows.cc
@@ -95,7 +95,6 @@ fhandler_windows::read (void *buf, size_t& len)
 
   if ((ssize_t) len == -1)
     __seterrno ();
-  return;
 }
 
 int
diff --git a/winsup/cygwin/fhandler_zero.cc b/winsup/cygwin/fhandler_zero.cc
index 4938c369ec..a3e74a62c0 100644
--- a/winsup/cygwin/fhandler_zero.cc
+++ b/winsup/cygwin/fhandler_zero.cc
@@ -46,7 +46,6 @@ void __stdcall
 fhandler_dev_zero::read (void *ptr, size_t& len)
 {
   memset (ptr, 0, len);
-  return;
 }
 
 _off64_t
diff --git a/winsup/cygwin/grp.cc b/winsup/cygwin/grp.cc
index 553b575a26..c59f25fc09 100644
--- a/winsup/cygwin/grp.cc
+++ b/winsup/cygwin/grp.cc
@@ -103,7 +103,6 @@ pwdgrp::read_group ()
   static char NO_COPY pretty_ls[] = "????????::-1:";
   if (wincap.has_security ())
     add_line (pretty_ls);
-  return;
 }
 
 muto NO_COPY pwdgrp::pglock;
diff --git a/winsup/cygwin/malloc_wrapper.cc b/winsup/cygwin/malloc_wrapper.cc
index 8cd6e3ecd6..3676a3a305 100644
--- a/winsup/cygwin/malloc_wrapper.cc
+++ b/winsup/cygwin/malloc_wrapper.cc
@@ -211,8 +211,6 @@ malloc_stats ()
       dlmalloc_stats ();
       __malloc_unlock ();
     }
-
-  return;
 }
 
 extern "C" struct mallinfo
diff --git a/winsup/cygwin/passwd.cc b/winsup/cygwin/passwd.cc
index d8593bf01d..127d323803 100644
--- a/winsup/cygwin/passwd.cc
+++ b/winsup/cygwin/passwd.cc
@@ -88,7 +88,6 @@ pwdgrp::read_passwd ()
       debug_printf ("Completing /etc/passwd: %s", linebuf);
       add_line (linebuf);
     }
-  return;
 }
 
 struct passwd *
diff --git a/winsup/cygwin/pipe.cc b/winsup/cygwin/pipe.cc
index c094311c18..0a289a7313 100644
--- a/winsup/cygwin/pipe.cc
+++ b/winsup/cygwin/pipe.cc
@@ -186,7 +186,6 @@ fhandler_pipe::read (void *in_ptr, size_t& in_len)
 	in_len = (size_t) -1;	/* received a signal */
     }
   ReleaseMutex (guard);
-  return;
 }
 
 int
diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc
index 8f3ed79175..04eef3651f 100644
--- a/winsup/cygwin/security.cc
+++ b/winsup/cygwin/security.cc
@@ -70,7 +70,6 @@ cygwin_set_impersonation_token (const HANDLE hToken)
 {
   debug_printf ("set_impersonation_token (%d)", hToken);
   cygheap->user.external_token = hToken == INVALID_HANDLE_VALUE ? NO_IMPERSONATION : hToken;
-  return;
 }
 
 void
@@ -1267,7 +1266,6 @@ get_attribute_from_acl (mode_t *attribute, PACL acl, PSID owner_sid,
 		| ((allow & S_IXUSR) ? S_IXGRP : 0));
     }
   *attribute |= allow;
-  return;
 }
 
 static void
@@ -1326,7 +1324,6 @@ get_info_from_sd (PSECURITY_DESCRIPTOR psd, mode_t *attribute,
 
   syscall_printf ("%sACL %x, uid %d, gid %d",
 		  (!acl_exists || !acl)?"NO ":"", *attribute, uid, gid);
-  return;
 }
 
 static void
diff --git a/winsup/cygwin/times.cc b/winsup/cygwin/times.cc
index aca27c6a59..851139c325 100644
--- a/winsup/cygwin/times.cc
+++ b/winsup/cygwin/times.cc
@@ -533,7 +533,6 @@ hires_us::prime ()
   primed_ft.QuadPart -= FACTOR;
   primed_ft.QuadPart /= 10;
   freq = (double) ((double) 1000000. / (double) ifreq.QuadPart);
-  return;
 }
 
 LONGLONG
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index c8995bdf41..6948ce2b3e 100644
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -127,8 +127,6 @@ internal_getlogin (cygheap_user &user)
 	}
     }
   cygheap->user.ontherange (CH_HOME, pw);
-
-  return;
 }
 
 void
@@ -570,5 +568,4 @@ pwdgrp::load (const char *posix_fname)
 
   debug_printf ("%s load %s", posix_fname, res);
   initialized = true;
-  return;
 }
-- 
2.11.0