Remove some more unneeded 'return;'s throughout.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 1a52198838ce0f9a81d037390fe06c1a8287453c..60c3fb3191ef4b654c39ae5255609363a7a3c334 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+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

diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index de786d0889b1a3d20e06bbbb06663d0eb98baff5..45d92dc2329831285fa3b43f426774dd5450bfc2 100644 (file)
--- 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 c3e185af0820c1bc71d907b3674a3faab2b8d0fe..3813eeef91a369a7847d0024d12bc5b12b0e77c5 100644 (file)
--- 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 53c51862230263d43a7b0c292da66259529a3a9a..58d67858d2c27c8eec638c7dcc487c0eee4700fd 100644 (file)
--- 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 5b2bb6388fcac2d467da9ce29fe308440bf6c244..24525ef40b55c370cb955ee5b3d652082527008c 100644 (file)
--- 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 37bb63983f3fb14f50bfaad8c706093af450110d..7c253e03eeef5686a0244469547c2310194c1c2a 100644 (file)
--- 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 dcf4206c5ad6ec3204537ec3ef90b3fb4c7e6448..785c8b69a86df768712aab027bff9db8f4890493 100644 (file)
--- 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 ce2bd5db8d70b64dbf0ad13afcebc1cb048847bb..5016c5a4fd3c93e0134c2d6fd628bed97237701a 100644 (file)
--- 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 494e81c581b8d68570d97d4bb35fe773b6a434b9..414d5c83f34424df191bf6aa1dd1139f21a24ebf 100644 (file)
--- 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 1e6bf3db5b16a1ec269c0169f37ab393f36af199..8232450bb29d6b034142b1026a970c60650ead2c 100644 (file)
--- 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 4938c369ec2d6314754e5e2046d758e81b0ed786..a3e74a62c047b805b37ff7a9f4a88c710a5b7bde 100644 (file)
--- 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 553b575a26f2f787395b028e1d316a169e8e92ab..c59f25fc09c41a6c3faa59a18b2beee15bad0e68 100644 (file)
--- 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 8cd6e3ecd66612c2edf905fc44cba610974f1fa4..3676a3a3053f95d31080faafc5959eb0c4381b23 100644 (file)
--- 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 d8593bf01d6e13682e8211da5b9b9d7201e07661..127d3238036352bfce46b874990d5358311aa158 100644 (file)
--- 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 c094311c186fb665420bc758d21a0b6230612a28..0a289a731322e30947c7d5c644a38f2afec05c17 100644 (file)
--- 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 8f3ed79175b75a42b391221ad5e35df7151ed221..04eef3651fc4c4d24e4991dfe5a05325c4ce5c7a 100644 (file)
--- 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 aca27c6a59c0e1af4d91a329a5bd9e4224daa16e..851139c325c1fe1bc22bc207e69f2f1dd9e99add 100644 (file)
--- 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 c8995bdf41fc539cfbb971d8599e8c9b1c5acae3..6948ce2b3eee334c602946cd13223561e7c4abbc 100644 (file)
--- 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;
 }