JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove some more unneeded 'return;'s throughout.

Browse Source
This commit is contained in:
Christopher Faylor 2005-09-14 14:27:56 +00:00
parent 18ea7328a7
commit 3aca3cb636
18 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/ChangeLog
View File

@ -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> 2005-09-14 Christopher Faylor <cgf@timesys.com>
* sigproc.h: Protect declaration so that it only happens when * sigproc.h: Protect declaration so that it only happens when

1
winsup/cygwin/fhandler_disk_file.cc
View File

@ -1553,7 +1553,6 @@ fhandler_cygdrive::rewinddir (DIR *dir)
{ {
pdrive = get_win32_name (); pdrive = get_win32_name ();
dir->__d_position = 0; dir->__d_position = 0;
return;
} }
int int

1
winsup/cygwin/fhandler_dsp.cc
View File

@ -1077,7 +1077,6 @@ fhandler_dev_dsp::read (void *ptr, size_t& len)
} }
audio_in_->read ((char *)ptr, (int&)len); audio_in_->read ((char *)ptr, (int&)len);
return;
} }
_off64_t _off64_t

1
winsup/cygwin/fhandler_mem.cc
View File

@ -217,7 +217,6 @@ fhandler_dev_mem::read (void *ptr, size_t& ulen)
} }
pos += ulen; pos += ulen;
return;
} }
_off64_t _off64_t

1
winsup/cygwin/fhandler_raw.cc
View File

@ -267,7 +267,6 @@ fhandler_dev_raw::raw_read (void *ptr, size_t& ulen)
err: err:
ulen = (size_t) -1; ulen = (size_t) -1;
return;
} }
int int

1
winsup/cygwin/fhandler_registry.cc
View File

@ -377,7 +377,6 @@ fhandler_registry::rewinddir (DIR * dir)
} }
dir->__d_position = 0; dir->__d_position = 0;
dir->__flags = dirent_saw_dot | dirent_saw_dot_dot; dir->__flags = dirent_saw_dot | dirent_saw_dot_dot;
return;
} }
int int

1
winsup/cygwin/fhandler_serial.cc
View File

@ -1066,7 +1066,6 @@ fhandler_serial::fixup_after_exec ()
{ {
overlapped_setup (); overlapped_setup ();
debug_printf ("io_status.hEvent %p", io_status.hEvent); debug_printf ("io_status.hEvent %p", io_status.hEvent);
return;
} }
int int

2
winsup/cygwin/fhandler_tty.cc
View File

@ -912,7 +912,6 @@ fhandler_tty_slave::read (void *ptr, size_t& len)
} }
termios_printf ("%d=read(%x, %d)", totalread, ptr, len); termios_printf ("%d=read(%x, %d)", totalread, ptr, len);
len = (size_t) totalread; len = (size_t) totalread;
return;
} }
int int
@ -1283,7 +1282,6 @@ void __stdcall
fhandler_pty_master::read (void *ptr, size_t& len) fhandler_pty_master::read (void *ptr, size_t& len)
{ {
len = (size_t) process_slave_output ((char *) ptr, len, pktmode); len = (size_t) process_slave_output ((char *) ptr, len, pktmode);
return;
} }
int int

2
winsup/cygwin/fhandler_virtual.cc
View File

@ -103,7 +103,6 @@ fhandler_virtual::seekdir (DIR * dir, _off64_t loc)
{ {
dir->__flags |= dirent_saw_dot | dirent_saw_dot_dot; dir->__flags |= dirent_saw_dot | dirent_saw_dot_dot;
dir->__d_position = loc; dir->__d_position = loc;
return;
} }
void void
@ -111,7 +110,6 @@ fhandler_virtual::rewinddir (DIR * dir)
{ {
dir->__d_position = 0; dir->__d_position = 0;
dir->__flags |= dirent_saw_dot | dirent_saw_dot_dot; dir->__flags |= dirent_saw_dot | dirent_saw_dot_dot;
return;
} }
int int

1
winsup/cygwin/fhandler_windows.cc
View File

@ -95,7 +95,6 @@ fhandler_windows::read (void *buf, size_t& len)
if ((ssize_t) len == -1) if ((ssize_t) len == -1)
__seterrno (); __seterrno ();
return;
} }
int int

1
winsup/cygwin/fhandler_zero.cc
View File

@ -46,7 +46,6 @@ void __stdcall
fhandler_dev_zero::read (void *ptr, size_t& len) fhandler_dev_zero::read (void *ptr, size_t& len)
{ {
memset (ptr, 0, len); memset (ptr, 0, len);
return;
} }
_off64_t _off64_t

1
winsup/cygwin/grp.cc
View File

@ -103,7 +103,6 @@ pwdgrp::read_group ()
static char NO_COPY pretty_ls[] = "????????::-1:"; static char NO_COPY pretty_ls[] = "????????::-1:";
if (wincap.has_security ()) if (wincap.has_security ())
add_line (pretty_ls); add_line (pretty_ls);
return;
} }
muto NO_COPY pwdgrp::pglock; muto NO_COPY pwdgrp::pglock;

2
winsup/cygwin/malloc_wrapper.cc
View File

@ -211,8 +211,6 @@ malloc_stats ()
dlmalloc_stats (); dlmalloc_stats ();
__malloc_unlock (); __malloc_unlock ();
} }
return;
} }
extern "C" struct mallinfo extern "C" struct mallinfo

1
winsup/cygwin/passwd.cc
View File

@ -88,7 +88,6 @@ pwdgrp::read_passwd ()
debug_printf ("Completing /etc/passwd: %s", linebuf); debug_printf ("Completing /etc/passwd: %s", linebuf);
add_line (linebuf); add_line (linebuf);
} }
return;
} }
struct passwd * struct passwd *

1
winsup/cygwin/pipe.cc
View File

@ -186,7 +186,6 @@ fhandler_pipe::read (void *in_ptr, size_t& in_len)
in_len = (size_t) -1; /* received a signal */ in_len = (size_t) -1; /* received a signal */
} }
ReleaseMutex (guard); ReleaseMutex (guard);
return;
} }
int int

3
winsup/cygwin/security.cc
View File

@ -70,7 +70,6 @@ cygwin_set_impersonation_token (const HANDLE hToken)
{ {
debug_printf ("set_impersonation_token (%d)", hToken); debug_printf ("set_impersonation_token (%d)", hToken);
cygheap->user.external_token = hToken == INVALID_HANDLE_VALUE ? NO_IMPERSONATION : hToken; cygheap->user.external_token = hToken == INVALID_HANDLE_VALUE ? NO_IMPERSONATION : hToken;
return;
} }
void void
@ -1267,7 +1266,6 @@ get_attribute_from_acl (mode_t *attribute, PACL acl, PSID owner_sid,
| ((allow & S_IXUSR) ? S_IXGRP : 0)); | ((allow & S_IXUSR) ? S_IXGRP : 0));
} }
*attribute |= allow; *attribute |= allow;
return;
} }
static void static void
@ -1326,7 +1324,6 @@ get_info_from_sd (PSECURITY_DESCRIPTOR psd, mode_t *attribute,
syscall_printf ("%sACL %x, uid %d, gid %d", syscall_printf ("%sACL %x, uid %d, gid %d",
(!acl_exists || !acl)?"NO ":"", *attribute, uid, gid); (!acl_exists || !acl)?"NO ":"", *attribute, uid, gid);
return;
} }
static void static void

1
winsup/cygwin/times.cc
View File

@ -533,7 +533,6 @@ hires_us::prime ()
primed_ft.QuadPart -= FACTOR; primed_ft.QuadPart -= FACTOR;
primed_ft.QuadPart /= 10; primed_ft.QuadPart /= 10;
freq = (double) ((double) 1000000. / (double) ifreq.QuadPart); freq = (double) ((double) 1000000. / (double) ifreq.QuadPart);
return;
} }
LONGLONG LONGLONG

3
winsup/cygwin/uinfo.cc
View File

@ -127,8 +127,6 @@ internal_getlogin (cygheap_user &user)
} }
} }
cygheap->user.ontherange (CH_HOME, pw); cygheap->user.ontherange (CH_HOME, pw);
return;
} }
void void
@ -570,5 +568,4 @@ pwdgrp::load (const char *posix_fname)
debug_printf ("%s load %s", posix_fname, res); debug_printf ("%s load %s", posix_fname, res);
initialized = true; initialized = true;
return;
} }